Address review comments

Mansi-mParticle · Mansi-mParticle · commit e5e805eb4ff6 · 2025-06-30T17:02:59.000-04:00
diff --git a/android-core/build.gradle b/android-core/build.gradle
@@ -13,8 +13,8 @@ android {
         exclude 'META-INF/LICENSE'
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.toVersion(JAVA_VERSION)
+        targetCompatibility JavaVersion.toVersion(JAVA_VERSION)
     }
 
     String url = '\"\"'
diff --git a/android-kit-base/build.gradle b/android-kit-base/build.gradle
@@ -37,8 +37,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.toVersion(JAVA_VERSION)
+        targetCompatibility JavaVersion.toVersion(JAVA_VERSION)
     }
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -5,3 +5,4 @@ org.gradle.jvmargs=-Xmx2560m
 #-XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4096
 android.defaults.buildfeatures.buildconfig=true
 systemProp.org.gradle.kotlin.dsl.precompiled.accessors.strict=true
+JAVA_VERSION=17
diff --git a/kit-plugin/build.gradle b/kit-plugin/build.gradle
@@ -14,8 +14,8 @@ dependencies {
 }
 
 compileGroovy {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)
+    targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)
 }
 
 dependencies {
diff --git a/testutils/build.gradle b/testutils/build.gradle
@@ -6,12 +6,12 @@ android {
     testNamespace 'com.mparticle.legacyTest'
     compileSdk 33
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17 // Set to your desired Java version
-        targetCompatibility = JavaVersion.VERSION_17 // Set to your desired Java version
+        sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)
+        targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)
     }
 
     kotlinOptions {
-        jvmTarget = "17" // Should match the Java version above
+        jvmTarget = JAVA_VERSION
     }
     defaultConfig {
         //This is set to 21 to avoid slow multidex.
diff --git a/tooling/android-plugin/build.gradle b/tooling/android-plugin/build.gradle
@@ -1,8 +1,8 @@
 apply plugin: 'groovy'
 apply plugin: 'kotlin'
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)
+targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)
 
 
 ext {
diff --git a/tooling/common/build.gradle b/tooling/common/build.gradle
@@ -16,10 +16,10 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)
+    targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(Integer.parseInt(JAVA_VERSION))
 }

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ android {`
`13`	`13`	`exclude 'META-INF/LICENSE'`
`14`	`14`	`}`
`15`	`15`	`compileOptions {`
`16`		`- sourceCompatibility JavaVersion.VERSION_17`
`17`		`- targetCompatibility JavaVersion.VERSION_17`
	`16`	`+ sourceCompatibility JavaVersion.toVersion(JAVA_VERSION)`
	`17`	`+ targetCompatibility JavaVersion.toVersion(JAVA_VERSION)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`String url = '\"\"'`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ android {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`compileOptions {`
`40`		`- sourceCompatibility JavaVersion.VERSION_17`
`41`		`- targetCompatibility JavaVersion.VERSION_17`
	`40`	`+ sourceCompatibility JavaVersion.toVersion(JAVA_VERSION)`
	`41`	`+ targetCompatibility JavaVersion.toVersion(JAVA_VERSION)`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ dependencies {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`compileGroovy {`
`17`		`- sourceCompatibility = JavaVersion.VERSION_17`
`18`		`- targetCompatibility = JavaVersion.VERSION_17`
	`17`	`+ sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)`
	`18`	`+ targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -16,10 +16,10 @@ dependencies {`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`java {`
`19`		`- sourceCompatibility = JavaVersion.VERSION_17`
`20`		`- targetCompatibility = JavaVersion.VERSION_17`
	`19`	`+ sourceCompatibility = JavaVersion.toVersion(JAVA_VERSION)`
	`20`	`+ targetCompatibility = JavaVersion.toVersion(JAVA_VERSION)`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`kotlin {`
`24`		`- jvmToolchain(17)`
	`24`	`+ jvmToolchain(Integer.parseInt(JAVA_VERSION))`
`25`	`25`	`}`