Update to Gradle 8

mParticle · Feb 1, 2024 · 3f2c6ac · 3f2c6ac
1 parent 4dd0ed1
commit 3f2c6ac
Show file tree

Hide file tree

Showing 16 changed files with 2,681 additions and 4,326 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -19,10 +19,10 @@ jobs:
       with:
         ruby-version: '3.1.0'
     - uses: actions/checkout@v2
-    - name: set up JDK 1.15
+    - name: set up JDK 1.17
       uses: actions/setup-java@v1
       with:
-        java-version: 1.15
+        java-version: 1.17
     - name: Install Cocoapods
       run: sudo gem install cocoapods; sudo gem install cocoapods-generate
     - name: Use Node.js
@@ -56,10 +56,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 1.15
+      - name: set up JDK 1.17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.15
+          java-version: 1.17
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -102,10 +102,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: set up JDK 1.15
+      - name: set up JDK 1.17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.15
+          java-version: 1.17
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -153,10 +153,10 @@ jobs:
         with:
           ruby-version: '3.1.0'
       - uses: actions/checkout@v2
-      - name: set up JDK 1.15
+      - name: set up JDK 1.17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.15
+          java-version: 1.17
       - name: Install Cocoapods
         run: sudo gem install cocoapods; sudo gem install cocoapods-generate
       - name: Use Node.js
@@ -200,10 +200,10 @@ jobs:
         with:
           ruby-version: '3.1.0'
       - uses: actions/checkout@v2
-      - name: set up JDK 1.15
+      - name: set up JDK 1.17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.15
+          java-version: 1.17
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -250,10 +250,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: set up JDK 1.15
+      - name: set up JDK 1.17
         uses: actions/setup-java@v1
         with:
-          java-version: 1.15
+          java-version: 1.17
       - name: Install Cocoapods
         run: sudo gem install cocoapods; sudo gem install cocoapods-generate
 

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,11 +30,6 @@ allprojects {
         mavenCentral()
         google()
     }
-    tasks.withType<KotlinCompile> {
-        kotlinOptions {
-            jvmTarget = "1.8"
-        }
-    }
     extra["signing.keyId"] = System.getenv("mavenSigningKeyId")
     extra["signing.secretKeyRingFile"] = System.getenv("mavenSigningKeyRingFile")
     extra["signing.password"] = System.getenv("mavenSigningKeyPassword")

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -9,8 +9,8 @@ repositories {
     mavenCentral()
 }
 java {
-    sourceCompatibility = JavaVersion.VERSION_15
-    targetCompatibility = JavaVersion.VERSION_15
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 kotlinDslPluginOptions {

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -7,7 +7,7 @@ object versions {
 
 object deps {
     object android {
-        const val gradlePlugin = "com.android.tools.build:gradle:7.1.0"
+        const val gradlePlugin = "com.android.tools.build:gradle:8.2.2"
     }
     object mparticle {
         const val androidSdk = "com.mparticle:android-core:5.55.0"