change: Restore Java 8 compatibility (#278)

usefulness · Aug 21, 2021 · d438262 · d438262
1 parent e89a165
commit d438262
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Changed
 - Update _Android Gradle Plugin_ to _7.0.1_, see [release notes](https://developer.android.com/studio/releases/gradle-plugin)
 
+## Fixed
+- Support back Java 8
 
 ## [0.32.0] - 2021-08-12
 ## Changed

diff --git a/android/build.gradle b/android/build.gradle
@@ -23,6 +23,9 @@ dependencies {
 
 tasks.withType(Test).configureEach {
     useJUnitPlatform()
+    javaLauncher = javaToolchains.launcherFor {
+        languageVersion = JavaLanguageVersion.of(11)
+    }
 }
 
 gradlePlugin {

diff --git a/android/src/test/kotlin/com/project/starter/modules/AndroidApplicataionPluginTest.kt b/android/src/test/kotlin/com/project/starter/modules/AndroidApplicataionPluginTest.kt
@@ -17,7 +17,6 @@ internal class AndroidApplicataionPluginTest : WithGradleProjectTest() {
     lateinit var module2Root: File
 
     @BeforeEach
-    @Suppress("LongMethod")
     fun setUp() {
         rootDirectory.apply {
             resolve("settings.gradle").writeText("""include ":module1", ":module2" """)

diff --git a/android/src/test/kotlin/com/project/starter/modules/AndroidLibraryPluginTest.kt b/android/src/test/kotlin/com/project/starter/modules/AndroidLibraryPluginTest.kt
@@ -17,7 +17,6 @@ internal class AndroidLibraryPluginTest : WithGradleProjectTest() {
     lateinit var module2Root: File
 
     @BeforeEach
-    @Suppress("LongMethod")
     fun setUp() {
         rootDirectory.apply {
             mkdirs()

diff --git a/android/src/test/kotlin/com/project/starter/modules/tasks/ForbidJavaFilesTaskTest.kt b/android/src/test/kotlin/com/project/starter/modules/tasks/ForbidJavaFilesTaskTest.kt
@@ -15,7 +15,6 @@ internal class ForbidJavaFilesTaskTest : WithGradleProjectTest() {
     lateinit var test: File
 
     @BeforeEach
-    @Suppress("LongMethod")
     fun setUp() {
         rootDirectory.apply {
             mkdirs()

diff --git a/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt b/android/src/test/kotlin/com/project/starter/quality/AndroidQualityPluginTest.kt
@@ -15,7 +15,6 @@ internal class AndroidQualityPluginTest : WithGradleProjectTest() {
     private lateinit var module2Root: File
 
     @BeforeEach
-    @Suppress("LongMethod")
     fun setUp() {
         rootDirectory.apply {
             resolve("settings.gradle").writeText("""include ":module1", ":module2" """)

diff --git a/build.gradle b/build.gradle
@@ -35,7 +35,7 @@ allprojects {
     pluginManager.withPlugin("java") {
         java {
             toolchain {
-                languageVersion.set(JavaLanguageVersion.of(11))
+                languageVersion.set(JavaLanguageVersion.of(8))
             }
         }
 

diff --git a/buildSrc/src/main/groovy/myproject.java-conventions.gradle b/buildSrc/src/main/groovy/myproject.java-conventions.gradle
@@ -1,5 +1,5 @@
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(8)
     }
 }
diff --git a/multiplatform/src/test/kotlin/com/project/starter/modules/MultiplatformLibraryPluginTest.kt b/multiplatform/src/test/kotlin/com/project/starter/modules/MultiplatformLibraryPluginTest.kt
@@ -23,7 +23,6 @@ internal class MultiplatformLibraryPluginTest : WithGradleProjectTest() {
     lateinit var origin: File
 
     @BeforeEach
-    @Suppress("LongMethod")
     fun setUp() {
         rootDirectory.apply {
             mkdirs()