From 92cb78a622f5cc7627f38e898445f174337670da Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Mon, 30 Oct 2023 16:55:18 -0400 Subject: [PATCH 1/4] build: set android.disableAutomaticComponentCreation=true --- dev-client/android/gradle.properties | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dev-client/android/gradle.properties b/dev-client/android/gradle.properties index 34056a18c..27bb2f521 100644 --- a/dev-client/android/gradle.properties +++ b/dev-client/android/gradle.properties @@ -44,3 +44,8 @@ newArchEnabled=false # Use this property to enable or disable the Hermes JS engine. # If set to false, you will be using JSC instead. hermesEnabled=true + +# WARNING:Software Components will not be created automatically for Maven publishing from +# Android Gradle Plugin 8.0. To opt-in to the future behavior, set the Gradle property +# android.disableAutomaticComponentCreation=true in the `gradle.properties` file or use the new publishing DSL. +android.disableAutomaticComponentCreation=true From 251d1ef17644c3c3156dca63d4a9c851f96bd9e0 Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Mon, 30 Oct 2023 16:55:47 -0400 Subject: [PATCH 2/4] fix: remove version number from gradle plugin matches what the react-native init script does currently --- dev-client/android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-client/android/build.gradle b/dev-client/android/build.gradle index eeae49377..561c3a6cb 100644 --- a/dev-client/android/build.gradle +++ b/dev-client/android/build.gradle @@ -16,7 +16,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:7.3.1") + classpath("com.android.tools.build:gradle") classpath("com.facebook.react:react-native-gradle-plugin") } } From 0330a16461425d21a3d451e37d746f1301397d73 Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Mon, 30 Oct 2023 16:56:15 -0400 Subject: [PATCH 3/4] build: add kotlin plugin Hopefully will fix: The Kotlin Gradle plugin was loaded multiple times in different subprojects, which is not supported and may break the build. This might happen in subprojects that apply the Kotlin plugins with the Gradle 'plugins { ... }' DSL if they specify explicit versions, even if the versions are equal. Please add the Kotlin plugin to the common parent project or the root project, then remove the versions in the subprojects. If the parent project does not need the plugin, add 'apply false' to the plugin line. See: https://docs.gradle.org/current/userguide/plugins.html#sec:subprojects_plugins_dsl The Kotlin plugin was loaded in the following projects: ':react-native-gesture-handler', ':rnmapbox_maps' --- dev-client/android/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev-client/android/build.gradle b/dev-client/android/build.gradle index 561c3a6cb..8666693be 100644 --- a/dev-client/android/build.gradle +++ b/dev-client/android/build.gradle @@ -6,6 +6,7 @@ buildscript { minSdkVersion = 21 compileSdkVersion = 33 targetSdkVersion = 33 + kotlinVersion = findProperty('android.kotlinVersion') ?: '1.8.10' // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP. ndkVersion = "23.1.7779620" @@ -18,6 +19,7 @@ buildscript { dependencies { classpath("com.android.tools.build:gradle") classpath("com.facebook.react:react-native-gradle-plugin") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") } } From a5436748fa94d81a25c8d4c7cda3943917286a57 Mon Sep 17 00:00:00 2001 From: Paul Schreiber Date: Mon, 30 Oct 2023 16:56:34 -0400 Subject: [PATCH 4/4] chore: update package-lock.json --- dev-client/package-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dev-client/package-lock.json b/dev-client/package-lock.json index a560d7e20..d8c3d2eeb 100644 --- a/dev-client/package-lock.json +++ b/dev-client/package-lock.json @@ -7270,9 +7270,9 @@ } }, "node_modules/@types/geojson": { - "version": "7946.0.11", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.11.tgz", - "integrity": "sha512-L7A0AINMXQpVwxHJ4jxD6/XjZ4NDufaRlUJHjNIFKYUFBH1SvOW+neaqb0VTRSLW5suSrSu19ObFEFnfNcr+qg==" + "version": "7946.0.12", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.12.tgz", + "integrity": "sha512-uK2z1ZHJyC0nQRbuovXFt4mzXDwf27vQeUWNhfKGwRcWW429GOhP8HxUHlM6TLH4bzmlv/HlEjpvJh3JfmGsAA==" }, "node_modules/@types/graceful-fs": { "version": "4.1.7", @@ -7298,9 +7298,9 @@ } }, "node_modules/@types/is-ci": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/is-ci/-/is-ci-3.0.1.tgz", - "integrity": "sha512-mnb1ngaGQPm6LFZaNdh3xPOoQMkrQb/KBPhPPN2p2Wk8XgeUqWj6xPnvyQ8rvcK/VFritVmQG8tvQuy7g+9/nQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/is-ci/-/is-ci-3.0.3.tgz", + "integrity": "sha512-FdHbjLiN2e8fk9QYQyVYZrK8svUDJpxSaSWLUga8EZS1RGAvvrqM9zbVARBtQuYPeLgnJxM2xloOswPwj1o2cQ==", "dependencies": { "ci-info": "^3.1.0" } @@ -7349,9 +7349,9 @@ "dev": true }, "node_modules/@types/minimist": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.3.tgz", - "integrity": "sha512-ZYFzrvyWUNhaPomn80dsMNgMeXxNWZBdkuG/hWlUvXvbdUH8ZERNBGXnU87McuGcWDsyzX2aChCv/SVN348k3A==" + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.4.tgz", + "integrity": "sha512-Kfe/D3hxHTusnPNRbycJE1N77WHDsdS4AjUYIzlDzhDrS47NrwuL3YW4VITxwR7KCVpzwgy4Rbj829KSSQmwXQ==" }, "node_modules/@types/node": { "version": "20.7.1", @@ -7359,9 +7359,9 @@ "integrity": "sha512-LT+OIXpp2kj4E2S/p91BMe+VgGX2+lfO+XTpfXhh+bCk2LkQtHZSub8ewFBMGP5ClysPjTDFa4sMI8Q3n4T0wg==" }, "node_modules/@types/normalize-package-data": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.2.tgz", - "integrity": "sha512-lqa4UEhhv/2sjjIQgjX8B+RBjj47eo0mzGasklVJ78UKGQY1r0VpB9XHDaZZO9qzEFDdy4MrXLuEaSmPrPSe/A==" + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.3.tgz", + "integrity": "sha512-ehPtgRgaULsFG8x0NeYJvmyH1hmlfsNLujHe9dQEia/7MAJYdzMSi19JtchUHjmBA6XC/75dK55mzZH+RyieSg==" }, "node_modules/@types/parse-json": { "version": "4.0.0", @@ -18285,9 +18285,9 @@ } }, "node_modules/spdx-license-ids": { - "version": "3.0.15", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.15.tgz", - "integrity": "sha512-lpT8hSQp9jAKp9mhtBU4Xjon8LPGBvLIuBiSVhMEtmLecTh2mO0tlqrAMp47tBXzMr13NJMQ2lf7RpQGLJ3HsQ==" + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz", + "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==" }, "node_modules/split-on-first": { "version": "1.1.0", @@ -18917,9 +18917,9 @@ "dev": true }, "node_modules/tty-table": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/tty-table/-/tty-table-4.2.1.tgz", - "integrity": "sha512-xz0uKo+KakCQ+Dxj1D/tKn2FSyreSYWzdkL/BYhgN6oMW808g8QRMuh1atAV9fjTPbWBjfbkKQpI/5rEcnAc7g==", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/tty-table/-/tty-table-4.2.3.tgz", + "integrity": "sha512-Fs15mu0vGzCrj8fmJNP7Ynxt5J7praPXqFN0leZeZBXJwkMxv9cb2D454k1ltrtUSJbZ4yH4e0CynsHLxmUfFA==", "dependencies": { "chalk": "^4.1.2", "csv": "^5.5.3",