diff --git a/native/android/app/src/main/AndroidManifest.xml b/native/android/app/src/main/AndroidManifest.xml index 06ce6e6ba..e9b32fb9c 100644 --- a/native/android/app/src/main/AndroidManifest.xml +++ b/native/android/app/src/main/AndroidManifest.xml @@ -1,68 +1,79 @@ + - + + + + + + > + + + + + diff --git a/native/android/build.gradle b/native/android/build.gradle index 5e1e715ac..32c95a495 100644 --- a/native/android/build.gradle +++ b/native/android/build.gradle @@ -1,59 +1,59 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - buildToolsVersion = "31.0.0" + buildToolsVersion = "33.0.0" minSdkVersion = 21 - compileSdkVersion = 31 - targetSdkVersion = 31 + compileSdkVersion = 33 + targetSdkVersion = 33 if (System.properties['os.arch'] == "aarch64") { // For M1 Users we need to use the NDK 24 which added support for aarch64 ndkVersion = "24.0.8215888" } else { // Otherwise we default to the side-by-side NDK version from AGP. ndkVersion = "21.4.7075529" } } repositories { google() mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.2.1") + classpath("com.android.tools.build:gradle:7.2.2") classpath("com.facebook.react:react-native-gradle-plugin") classpath("de.undercouch:gradle-download-task:5.0.1") classpath("com.google.gms:google-services:4.3.14") classpath('org.ajoberstar:grgit:1.7.2') // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } ext { reactNativeFFmpegPackage = "min-gpl-lts" } allprojects { repositories { maven { // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm url(new File(["node", "--print", "require.resolve('react-native/package.json')"].execute(null, rootDir).text.trim(), "../android")) } maven { // Android JSC is installed from npm url(new File(["node", "--print", "require.resolve('jsc-android/package.json')"].execute(null, rootDir).text.trim(), "../dist")) } mavenCentral { // We don't want to fetch react-native from Maven Central as there are // older versions over there. content { excludeGroup "com.facebook.react" } } google() gradlePluginPortal() maven { url 'https://www.jitpack.io' } jcenter() } } diff --git a/native/expo-modules/aes-crypto/android/build.gradle b/native/expo-modules/aes-crypto/android/build.gradle index d44b660a5..be52ff59f 100644 --- a/native/expo-modules/aes-crypto/android/build.gradle +++ b/native/expo-modules/aes-crypto/android/build.gradle @@ -1,91 +1,91 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'maven-publish' group = 'app.comm.android.aescrypto' version = '0.1.0' buildscript { def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle") if (expoModulesCorePlugin.exists()) { apply from: expoModulesCorePlugin applyKotlinExpoModulesCorePlugin() } // Simple helper that allows the root project to override versions declared by this library. ext.safeExtGet = { prop, fallback -> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } // Ensures backward compatibility ext.getKotlinVersion = { if (ext.has("kotlinVersion")) { ext.kotlinVersion() } else { ext.safeExtGet("kotlinVersion", "1.6.10") } } repositories { mavenCentral() } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}") } } // Creating sources with comments task androidSourcesJar(type: Jar) { classifier = 'sources' from android.sourceSets.main.java.srcDirs } afterEvaluate { publishing { publications { release(MavenPublication) { from components.release // Add additional sourcesJar to artifacts artifact(androidSourcesJar) } } repositories { maven { url = mavenLocal().url } } } } android { - compileSdkVersion safeExtGet("compileSdkVersion", 31) + compileSdkVersion safeExtGet("compileSdkVersion", 33) compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion } defaultConfig { minSdkVersion safeExtGet("minSdkVersion", 21) - targetSdkVersion safeExtGet("targetSdkVersion", 31) + targetSdkVersion safeExtGet("targetSdkVersion", 33) versionCode 1 versionName "0.1.0" } lintOptions { abortOnError false } } repositories { mavenCentral() } dependencies { implementation project(':expo-modules-core') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}" } diff --git a/native/expo-modules/android-lifecycle/android/build.gradle b/native/expo-modules/android-lifecycle/android/build.gradle index 961274e40..22b998395 100644 --- a/native/expo-modules/android-lifecycle/android/build.gradle +++ b/native/expo-modules/android-lifecycle/android/build.gradle @@ -1,96 +1,96 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' apply plugin: 'maven-publish' group = 'app.comm.android.lifecycle' version = '0.0.1' buildscript { def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle") if (expoModulesCorePlugin.exists()) { apply from: expoModulesCorePlugin applyKotlinExpoModulesCorePlugin() } // Simple helper that allows the root project to override versions declared by this library. ext.safeExtGet = { prop, fallback -> rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } // Ensures backward compatibility ext.getKotlinVersion = { if (ext.has("kotlinVersion")) { ext.kotlinVersion() } else { ext.safeExtGet("kotlinVersion", "1.6.10") } } repositories { mavenCentral() } dependencies { classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}") } } // Creating sources with comments task androidSourcesJar(type: Jar) { classifier = 'sources' from android.sourceSets.main.java.srcDirs } afterEvaluate { publishing { publications { release(MavenPublication) { from components.release // Add additional sourcesJar to artifacts artifact(androidSourcesJar) } } repositories { maven { url = mavenLocal().url } } } } android { - compileSdkVersion safeExtGet("compileSdkVersion", 31) + compileSdkVersion safeExtGet("compileSdkVersion", 33) compileOptions { sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } kotlinOptions { jvmTarget = JavaVersion.VERSION_11.majorVersion } defaultConfig { minSdkVersion safeExtGet("minSdkVersion", 21) - targetSdkVersion safeExtGet("targetSdkVersion", 31) + targetSdkVersion safeExtGet("targetSdkVersion", 33) versionCode 1 versionName "0.1.0" } lintOptions { abortOnError false } } repositories { mavenCentral() } dependencies { implementation project(':expo-modules-core') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}" implementation "androidx.lifecycle:lifecycle-runtime:2.5.1" implementation "androidx.lifecycle:lifecycle-process:2.5.1" implementation 'com.facebook.react:react-native:+' }