Including build-logic Java11 updates

childofthehorn · childofthehorn · commit 06b48051a9d0 · 2023-04-20T16:35:43.000-05:00
Signed-off-by: Stacy Devino &lt;stacydevino@gmail.com&gt;
diff --git a/template/build-logic/convention/src/main/kotlin/CoroutinesConventionPlugin.kt b/template/build-logic/convention/src/main/kotlin/CoroutinesConventionPlugin.kt
@@ -24,7 +24,7 @@ class CoroutinesConventionPlugin: Plugin<Project> {
                 "-opt-in=kotlin.Experimental",
             )
 
-            jvmTarget = JavaVersion.VERSION_1_8.toString()
+            jvmTarget = JavaVersion.VERSION_11.toString()
         }
 
         dependencies {
diff --git a/template/build-logic/convention/src/main/kotlin/KotlinFeatureConventionPlugin.kt b/template/build-logic/convention/src/main/kotlin/KotlinFeatureConventionPlugin.kt
@@ -19,8 +19,8 @@ class KotlinFeatureConventionPlugin : Plugin<Project> {
             }
 
             extensions.configure<JavaPluginExtension> {
-                sourceCompatibility = JavaVersion.VERSION_1_8
-                targetCompatibility = JavaVersion.VERSION_1_8
+                sourceCompatibility = JavaVersion.VERSION_11
+                targetCompatibility = JavaVersion.VERSION_11
             }
 
             dependencies {
diff --git a/template/build-logic/gradle/wrapper/gradle-wrapper.properties b/template/build-logic/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ class CoroutinesConventionPlugin: Plugin<Project> {`
`24`	`24`	`"-opt-in=kotlin.Experimental",`
`25`	`25`	`)`
`26`	`26`
`27`		`- jvmTarget = JavaVersion.VERSION_1_8.toString()`
	`27`	`+ jvmTarget = JavaVersion.VERSION_11.toString()`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ class KotlinFeatureConventionPlugin : Plugin<Project> {`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`extensions.configure<JavaPluginExtension> {`
`22`		`- sourceCompatibility = JavaVersion.VERSION_1_8`
`23`		`- targetCompatibility = JavaVersion.VERSION_1_8`
	`22`	`+ sourceCompatibility = JavaVersion.VERSION_11`
	`23`	`+ targetCompatibility = JavaVersion.VERSION_11`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`dependencies {`