Merge pull request #207 from xmtp/ar/java-17-support

feat: Added support for Java 17
xmtp · Jan 16, 2024 · ddb7615 · ddb7615
2 parents ddae69a + 9c65831
commit ddb7615
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -66,15 +66,18 @@ afterEvaluate {
 }
 
 android {
-  compileSdkVersion safeExtGet("compileSdkVersion", 31)
+  compileSdkVersion safeExtGet("compileSdkVersion", 34)
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_11
-    targetCompatibility JavaVersion.VERSION_11
-  }
+  def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+  if (agpVersion.tokenize('.')[0].toInteger() < 8) {
+    compileOptions {
+      sourceCompatibility JavaVersion.VERSION_17
+      targetCompatibility JavaVersion.VERSION_17
+    }
 
-  kotlinOptions {
-    jvmTarget = JavaVersion.VERSION_11.majorVersion
+    kotlinOptions {
+      jvmTarget = JavaVersion.VERSION_17.majorVersion
+    }
   }
 
   defaultConfig {