Go back to java 1.8 for now

RevenueCat · Oct 31, 2023 · cc0b9e8 · cc0b9e8
1 parent c21a8df
commit cc0b9e8
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 31 deletions.
diff --git a/api-tester/build.gradle b/api-tester/build.gradle
@@ -21,8 +21,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {

diff --git a/base-application.gradle b/base-application.gradle
@@ -9,12 +9,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
     buildFeatures {

diff --git a/examples/CustomEntitlementComputationSample/app/build.gradle b/examples/CustomEntitlementComputationSample/app/build.gradle
@@ -29,8 +29,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
         jvmTarget = '1.8'

diff --git a/examples/MagicWeather/app/build.gradle b/examples/MagicWeather/app/build.gradle
@@ -37,11 +37,11 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
     buildFeatures {
         buildConfig true

diff --git a/examples/paywall-tester/build.gradle b/examples/paywall-tester/build.gradle
@@ -48,11 +48,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
     buildFeatures {
         compose true
@@ -67,10 +67,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
-
 dependencies {
     implementation project(path: ':purchases')
     implementation project(path: ':feature:amazon')
@@ -93,8 +89,8 @@ dependencies {
     debugImplementation libs.compose.ui.tooling
     debugImplementation libs.androidx.test.compose.manifest
 
-    implementation "com.emergetools.snapshots:snapshots-annotations:0.8.1"
+    implementation "com.emergetools.snapshots:snapshots-annotations:0.8.3"
 
-    androidTestImplementation "com.emergetools.snapshots:snapshots:0.8.1"
-    ksp "com.emergetools.snapshots:snapshots-processor:0.8.1"
+    androidTestImplementation "com.emergetools.snapshots:snapshots:0.8.3"
+    ksp "com.emergetools.snapshots:snapshots-processor:0.8.3"
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -37,7 +37,7 @@ commonmark = "0.21.0"
 activity-compose = "1.7.2"
 fragment = "1.6.1"
 emergetools = "2.1.3"
-ksp = "1.8.0-1.0.9" # We are still using kotlin 1.8.0
+ksp = "1.8.0-1.0.8" # We are still using kotlin 1.8.0
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

diff --git a/library.gradle b/library.gradle
@@ -17,11 +17,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 }
 

diff --git a/ui/revenuecatui/build.gradle b/ui/revenuecatui/build.gradle
@@ -42,10 +42,6 @@ android {
     }
 }
 
-kotlin {
-    jvmToolchain(17)
-}
-
 dependencies {
     implementation project(path: ':purchases')
 
@@ -73,10 +69,10 @@ dependencies {
     debugImplementation libs.compose.ui.tooling
     debugImplementation libs.androidx.test.compose.manifest
 
-    androidTestImplementation "com.emergetools.snapshots:snapshots:0.8.1"
+    androidTestImplementation "com.emergetools.snapshots:snapshots:0.8.3"
     // For Compose @Preview snapshot generation from the main source set:
-    ksp "com.emergetools.snapshots:snapshots-processor:0.8.1"
-    kspAndroidTest "com.emergetools.snapshots:snapshots-processor:0.8.1"
+    ksp "com.emergetools.snapshots:snapshots-processor:0.8.3"
+    kspAndroidTest "com.emergetools.snapshots:snapshots-processor:0.8.3"
 
     testImplementation libs.bundles.test
     testImplementation libs.coroutines.test