Merge pull request #154 from TheOneWithTheBraid/braid/update-gradle-c…

…onfiguration chore: update Gradle configuration
UnifiedPush · Aug 15, 2024 · 9f4195f · 9f4195f
2 parents 645238e + 5c6dd52
commit 9f4195f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/unifiedpush_android/android/build.gradle b/unifiedpush_android/android/build.gradle
@@ -2,14 +2,14 @@ group 'org.unifiedpush.flutter.connector'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.7.20'
+    ext.kotlin_version = '2.0.10'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.0'
+        classpath 'com.android.tools.build:gradle:8.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -30,14 +30,20 @@ rootProject.allprojects {
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
-
-kotlin {
-    jvmToolchain(8)
-}
-
 android {
     compileSdk 34
 
+    compileOptions{
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+        // languageVersion provides source compatibility with the specified version of Kotlin
+        languageVersion = '1.7'
+    }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }

diff --git a/unifiedpush_android/android/gradle/wrapper/gradle-wrapper.properties b/unifiedpush_android/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Wed Dec 27 11:09:44 CET 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists