Source compatibility for JVM 1.8

findjigar · findjigar · commit ad43f2c870b9 · 2023-09-22T13:29:45.000-04:00
diff --git a/bugsnag-ios-link/build.gradle.kts b/bugsnag-ios-link/build.gradle.kts
@@ -48,8 +48,9 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
 }
 
 val GROUP: String by project
diff --git a/bugsnag/build.gradle.kts b/bugsnag/build.gradle.kts
@@ -10,6 +10,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -44,7 +45,7 @@ kotlin {
     tvosArm64()
     tvosSimulatorArm64()
     tvosX64()
-    
+
     sourceSets {
         val commonMain by getting {
             dependencies {
@@ -86,7 +87,7 @@ kotlin {
                 compilerOpts("-DNS_FORMAT_ARGUMENT(A)=", "-D_Nullable_result=_Nullable")
 //            extraOpts("-mode", "sourcecode")
             }
-        }   
+        }
     }
 }
 
@@ -97,7 +98,12 @@ android {
         minSdk = libs.versions.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
+
+}
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
 }
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -10,6 +10,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -74,9 +75,13 @@ android {
         minSdk = libs.versions.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 
+tasks.withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 apply(plugin = "com.vanniktech.maven.publish")
diff --git a/crashlytics-ios-link/build.gradle.kts b/crashlytics-ios-link/build.gradle.kts
@@ -10,7 +10,6 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
-
 plugins {
     `kotlin-dsl`
     kotlin("jvm")
@@ -48,8 +47,9 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(8))
+    }
 }
 
 val GROUP: String by project
diff --git a/crashlytics/build.gradle.kts b/crashlytics/build.gradle.kts
@@ -10,6 +10,7 @@
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -96,7 +97,11 @@ android {
         minSdk = libs.versions.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
+
+tasks.withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ kotlin.code.style=official
 SONATYPE_HOST=DEFAULT
 RELEASE_SIGNING_ENABLED=true
 GROUP=co.touchlab.crashkios
-VERSION_NAME=0.8.3
+VERSION_NAME=0.8.4
 
 POM_URL=https://github.com/touchlab/CrashKios
 POM_DESCRIPTION=Kotlin Native iOS Crash Report Library
diff --git a/samples/sample-bugsnag/app/build.gradle.kts b/samples/sample-bugsnag/app/build.gradle.kts
@@ -34,8 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
     buildFeatures {
         viewBinding = true
diff --git a/samples/sample-bugsnag/shared/build.gradle.kts b/samples/sample-bugsnag/shared/build.gradle.kts
@@ -7,6 +7,7 @@
  *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     id("com.android.library")
@@ -22,11 +23,15 @@ android {
         minSdk = projectLibs.versions.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 
+tasks.withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 version = "0.0.1"
 
 kotlin {
diff --git a/samples/sample-crashlytics/app/build.gradle.kts b/samples/sample-crashlytics/app/build.gradle.kts
@@ -35,8 +35,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
     }
     buildFeatures {
         viewBinding = true
diff --git a/samples/sample-crashlytics/shared/build.gradle.kts b/samples/sample-crashlytics/shared/build.gradle.kts
@@ -7,6 +7,8 @@
  *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
  */
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
 plugins {
     id("com.android.library")
     kotlin("multiplatform")
@@ -21,11 +23,15 @@ android {
         minSdk = projectLibs.versions.minSdk.get().toInt()
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 }
 
+tasks.withType<KotlinCompile> {
+    kotlinOptions.jvmTarget = "1.8"
+}
+
 version = "0.1.2"
 
 kotlin {

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,9 @@ dependencies {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`java {`
`51`		`- sourceCompatibility = JavaVersion.VERSION_17`
`52`		`- targetCompatibility = JavaVersion.VERSION_17`
	`51`	`+ toolchain {`
	`52`	`+ languageVersion.set(JavaLanguageVersion.of(8))`
	`53`	`+ }`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`val GROUP: String by project`
Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,11 @@ android {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`compileOptions {`
`37`		`- sourceCompatibility = JavaVersion.VERSION_17`
`38`		`- targetCompatibility = JavaVersion.VERSION_17`
	`37`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`38`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
	`39`	`+ }`
	`40`	`+ kotlinOptions {`
	`41`	`+ jvmTarget = "1.8"`
`39`	`42`	`}`
`40`	`43`	`buildFeatures {`
`41`	`44`	`viewBinding = true`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.`
`9`	`9`	`*/`
	`10`	`+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
`10`	`11`
`11`	`12`	`plugins {`
`12`	`13`	`id("com.android.library")`
`@@ -22,11 +23,15 @@ android {`
`22`	`23`	`minSdk = projectLibs.versions.minSdk.get().toInt()`
`23`	`24`	`}`
`24`	`25`	`compileOptions {`
`25`		`- sourceCompatibility = JavaVersion.VERSION_17`
`26`		`- targetCompatibility = JavaVersion.VERSION_17`
	`26`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`27`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
`27`	`28`	`}`
`28`	`29`	`}`
`29`	`30`
	`31`	`+tasks.withType<KotlinCompile> {`
	`32`	`+ kotlinOptions.jvmTarget = "1.8"`
	`33`	`+}`
	`34`	`+`
`30`	`35`	`version = "0.0.1"`
`31`	`36`
`32`	`37`	`kotlin {`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,11 @@ android {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`compileOptions {`
`38`		`- sourceCompatibility = JavaVersion.VERSION_17`
`39`		`- targetCompatibility = JavaVersion.VERSION_17`
	`38`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`39`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
	`40`	`+ }`
	`41`	`+ kotlinOptions {`
	`42`	`+ jvmTarget = "1.8"`
`40`	`43`	`}`
`41`	`44`	`buildFeatures {`
`42`	`45`	`viewBinding = true`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@`
`7`	`7`	`*`
`8`	`8`	`* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.`
`9`	`9`	`*/`
	`10`	`+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile`
	`11`	`+`
`10`	`12`	`plugins {`
`11`	`13`	`id("com.android.library")`
`12`	`14`	`kotlin("multiplatform")`
`@@ -21,11 +23,15 @@ android {`
`21`	`23`	`minSdk = projectLibs.versions.minSdk.get().toInt()`
`22`	`24`	`}`
`23`	`25`	`compileOptions {`
`24`		`- sourceCompatibility = JavaVersion.VERSION_17`
`25`		`- targetCompatibility = JavaVersion.VERSION_17`
	`26`	`+ sourceCompatibility = JavaVersion.VERSION_1_8`
	`27`	`+ targetCompatibility = JavaVersion.VERSION_1_8`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`
	`31`	`+tasks.withType<KotlinCompile> {`
	`32`	`+ kotlinOptions.jvmTarget = "1.8"`
	`33`	`+}`
	`34`	`+`
`29`	`35`	`version = "0.1.2"`
`30`	`36`
`31`	`37`	`kotlin {`