update to Gradle 8

4 files changed, 18 insertions, 6 deletions

diff --git a/app/build.gradle b/app/build.gradle
index aa9e0480..efe7c1a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,9 +4,8 @@ import java.util.regex.Pattern
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 33
   ndkVersion "21.4.7075529"
-  buildToolsVersion '33.0.2'
+  namespace = "se.leap.bitmaskclient"
 
   compileOptions {
     targetCompatibility 1.8
@@ -17,6 +16,17 @@ android {
     enabled = true
   }
 
+  packaging {
+    jniLibs {
+      useLegacyPackaging = true
+    }
+  }
+
+  buildFeatures {
+    buildConfig true
+    aidl true
+  }
+
   defaultConfig {
     applicationId "se.leap.bitmaskclient"
     // the factor 1000 is used so that gplay users can upgrade from split apks ((current version number - 1) * 1000) + n
@@ -24,6 +34,7 @@ android {
     // however we don't calculate the versionCode here, because F-Droid doesn't like that
     versionCode 169000
     versionName "1.1.8"
+    compileSdk 33
     minSdkVersion 21
     targetSdkVersion 33
     vectorDrawables.useSupportLibrary = true
@@ -498,7 +509,7 @@ subprojects {
   afterEvaluate {project ->
     if (project.hasProperty("android")) {
       android {
-        compileSdkVersion 31
+        compileSdkVersion 33
       }
     }
   }
diff --git a/build.gradle b/build.gradle
index 6fbe3207..aafc76c2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
     google()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.2.2'
+    classpath 'com.android.tools.build:gradle:8.1.2'
   }
 }
 
diff --git a/gradle.properties b/gradle.properties
index 44700ef5..a537ad3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 android.enableJetifier=true
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx4096m
-android.bundle.enableUncompressedNativeLibs = false
\ No newline at end of file
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index aaa09975..5600c39d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 #Sun Aug 07 23:06:29 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
+distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME