#1455 | Gradle upgrade - Partial via AGP Upgrade Assistant

avniproject · Jul 16, 2024 · c1ed919 · c1ed919
1 parent 6c6dfba
commit c1ed919
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/packages/openchs-android/android/app/build.gradle b/packages/openchs-android/android/app/build.gradle
@@ -213,6 +213,7 @@ android {
             manifestPlaceholders = [bugsnagAPIKey: System.getenv("GRAMIN_BUGSNAG_API_KEY") ?: "dummy"]
         }
     }
+    namespace 'com.openchsclient'
     sourceSets {
         // Required to enable TamperChecking, init this only for flavours which need Security Tamper Check enabled
         lfe.java.srcDir 'src/common/java'

diff --git a/packages/openchs-android/android/app/src/main/AndroidManifest.xml b/packages/openchs-android/android/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.openchsclient">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

diff --git a/packages/openchs-android/android/build.gradle b/packages/openchs-android/android/build.gradle
@@ -9,7 +9,7 @@ buildscript {
         targetSdkVersion = 33
         supportLibVersion = "1.2.0"
         googlePlayServicesVersion = "16.0.0" //Without this the react-native-device-info crashes
-        kotlinVersion = '1.6.0'
+        kotlinVersion = '1.6.21'
 
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
@@ -23,8 +23,8 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle'
-        classpath 'com.google.gms:google-services:4.3.2'
+        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'com.google.gms:google-services:4.3.10'
         classpath 'de.undercouch:gradle-download-task:4.1.2'
         classpath('com.facebook.react:react-native-gradle-plugin')
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/packages/openchs-android/android/gradle.properties b/packages/openchs-android/android/gradle.properties
@@ -26,3 +26,6 @@ FLIPPER_VERSION=0.182.0
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
diff --git a/packages/openchs-android/android/gradle/wrapper/gradle-wrapper.properties b/packages/openchs-android/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists