diff --git a/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle b/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle index 34ea718194..9ab8ee584c 100644 --- a/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle +++ b/packages/engine-rn-tvos/templates/platforms/androidtv/build.gradle @@ -2,13 +2,13 @@ buildscript { ext { - buildToolsVersion = "33.0.0" - minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 + buildToolsVersion = '{{BUILD_TOOLS_VERSION}}' + minSdkVersion = {{MIN_SDK_VERSION}} + compileSdkVersion = {{COMPILE_SDK_VERSION}} + targetSdkVersion = {{TARGET_SDK_VERSION}} // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. - ndkVersion = "23.1.7779620" + ndkVersion = {{NDK_VERSION}} } repositories { google() diff --git a/packages/engine-rn/templates/platforms/android/app/src/main/AndroidManifest.xml b/packages/engine-rn/templates/platforms/android/app/src/main/AndroidManifest.xml index 23a2a3395c..723dcf2125 100755 --- a/packages/engine-rn/templates/platforms/android/app/src/main/AndroidManifest.xml +++ b/packages/engine-rn/templates/platforms/android/app/src/main/AndroidManifest.xml @@ -1,32 +1,5 @@ - - - - - - - - - - - - - - +{{PLUGIN_MANIFEST_FILE}} \ No newline at end of file diff --git a/packages/engine-rn/templates/platforms/android/build.gradle b/packages/engine-rn/templates/platforms/android/build.gradle index 34ea718194..9ab8ee584c 100644 --- a/packages/engine-rn/templates/platforms/android/build.gradle +++ b/packages/engine-rn/templates/platforms/android/build.gradle @@ -2,13 +2,13 @@ buildscript { ext { - buildToolsVersion = "33.0.0" - minSdkVersion = 21 - compileSdkVersion = 33 - targetSdkVersion = 33 + buildToolsVersion = '{{BUILD_TOOLS_VERSION}}' + minSdkVersion = {{MIN_SDK_VERSION}} + compileSdkVersion = {{COMPILE_SDK_VERSION}} + targetSdkVersion = {{TARGET_SDK_VERSION}} // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. - ndkVersion = "23.1.7779620" + ndkVersion = {{NDK_VERSION}} } repositories { google() diff --git a/packages/sdk-android/src/gradleParser.ts b/packages/sdk-android/src/gradleParser.ts index 4356969691..2f1e0baac0 100644 --- a/packages/sdk-android/src/gradleParser.ts +++ b/packages/sdk-android/src/gradleParser.ts @@ -1,30 +1,30 @@ -import path from 'path'; import { OverridesOptions, RenativeConfigPlatform, RenativeConfigPluginPlatform, RnvContext, RnvPlugin, + addSystemInjects, + chalk, + doResolve, + doResolvePath, + fsExistsSync, + fsWriteFileSync, getAppFolder, + getAppId, getAppVersion, getAppVersionCode, - getAppId, getBuildFilePath, getConfigProp, - addSystemInjects, - fsExistsSync, - writeCleanFile, - fsWriteFileSync, - doResolve, - doResolvePath, - chalk, + includesPluginPath, + isSystemWin, + logDebug, logTask, logWarning, - logDebug, sanitizePluginPath, - includesPluginPath, - isSystemWin, + writeCleanFile, } from '@rnv/core'; +import path from 'path'; import { Context } from './types'; export const parseBuildGradleSync = (c: Context) => { @@ -79,6 +79,10 @@ export const parseBuildGradleSync = (c: Context) => { pattern: '{{MIN_SDK_VERSION}}', override: c.payload.pluginConfigAndroid.minSdkVersion, }, + { + pattern: '{{NDK_VERSION}}', + override: c.payload.pluginConfigAndroid.ndkVersion, + }, { pattern: '{{INJECT_AFTER_ALL}}', override: c.payload.pluginConfigAndroid.buildGradleAfterAll, @@ -182,8 +186,9 @@ export const parseAppBuildGradleSync = (c: Context) => { // ANDROID PROPS c.payload.pluginConfigAndroid.minSdkVersion = getConfigProp(c, platform, 'minSdkVersion', 24); - c.payload.pluginConfigAndroid.targetSdkVersion = getConfigProp(c, platform, 'targetSdkVersion', 28); - c.payload.pluginConfigAndroid.compileSdkVersion = getConfigProp(c, platform, 'compileSdkVersion', 28); + c.payload.pluginConfigAndroid.targetSdkVersion = getConfigProp(c, platform, 'targetSdkVersion', 33); + c.payload.pluginConfigAndroid.compileSdkVersion = getConfigProp(c, platform, 'compileSdkVersion', 33); + c.payload.pluginConfigAndroid.ndkVersion = getConfigProp(c, platform, 'ndkVersion', '23.1.7779620'); c.payload.pluginConfigAndroid.gradleBuildToolsVersion = getConfigProp( c, platform, @@ -191,7 +196,7 @@ export const parseAppBuildGradleSync = (c: Context) => { '4.2.2' ); c.payload.pluginConfigAndroid.supportLibVersion = getConfigProp(c, platform, 'supportLibVersion', '28.0.0'); - c.payload.pluginConfigAndroid.buildToolsVersion = getConfigProp(c, platform, 'buildToolsVersion', '28.0.0'); + c.payload.pluginConfigAndroid.buildToolsVersion = getConfigProp(c, platform, 'buildToolsVersion', '33.0.0'); c.payload.pluginConfigAndroid.kotlinVersion = getConfigProp(c, platform, 'kotlinVersion', '1.4.20'); c.payload.pluginConfigAndroid.googleServicesVersion = getConfigProp(c, platform, 'googleServicesVersion', '4.2.0'); diff --git a/packages/sdk-android/src/runner.ts b/packages/sdk-android/src/runner.ts index d8e214414e..4741223261 100644 --- a/packages/sdk-android/src/runner.ts +++ b/packages/sdk-android/src/runner.ts @@ -450,6 +450,7 @@ export const configureProject = async (c: Context) => { buildTypes: '', compileOptions: '', compileSdkVersion: '', + ndkVersion: '', gradleBuildToolsVersion: '', gradleWrapperVersion: '', localProperties: '', diff --git a/packages/sdk-android/src/types.ts b/packages/sdk-android/src/types.ts index 097cedd5e3..6537749d94 100644 --- a/packages/sdk-android/src/types.ts +++ b/packages/sdk-android/src/types.ts @@ -15,6 +15,7 @@ export type Payload = { buildTypes: string; multiAPKs: string; minSdkVersion: string; + ndkVersion: string; targetSdkVersion: string; compileSdkVersion: string; compileOptions: string; diff --git a/packages/sdk-android/supportFiles/AndroidManifest_android.json b/packages/sdk-android/supportFiles/AndroidManifest_android.json index 17808a2090..8041a1e147 100644 --- a/packages/sdk-android/supportFiles/AndroidManifest_android.json +++ b/packages/sdk-android/supportFiles/AndroidManifest_android.json @@ -77,4 +77,4 @@ ] } ] -} \ No newline at end of file +}