TECH: deleted target 17

KasperskyLab · Feb 21, 2024 · 254054d · 254054d
1 parent ff40a1c
commit 254054d
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 6 deletions.
diff --git a/.github/workflows/publication_maven.yml b/.github/workflows/publication_maven.yml
@@ -30,7 +30,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 11
       - name: Tests
         run: make unit_tests
       - name: Assemble build

diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -19,7 +19,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 11
       - name: Run static analysis
         run: make static_analysis
       - name: Run unit tests

diff --git a/.github/workflows/snapshot_check.yml b/.github/workflows/snapshot_check.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: 17
+          java-version: 11
       - name: Assemble projects
         run: ./gradlew -Pkaspresso.snapshotVersion=${{ inputs.kaspressoVersion }} assembleDebugAndroidTest
       - name: Check legal documents

diff --git a/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-app.gradle.kts
@@ -8,6 +8,11 @@ plugins {
 }
 
 android {
+    compileOptions {
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+    }
+
     testBuildType = "debug"
 
     defaultConfig {
@@ -32,6 +37,12 @@ android {
     }
 
     kotlin {
-        jvmToolchain(JavaVersion.VERSION_17.majorVersion.toInt())
+        jvmToolchain(JavaVersion.VERSION_1_8.majorVersion.toInt())
+    }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 }
diff --git a/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-base.gradle.kts
@@ -5,6 +5,11 @@ configure<BaseExtension> {
 
     compileSdkVersion(34)
 
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+
     defaultConfig {
         minSdk = 18
         targetSdk = 30

diff --git a/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts b/build-logic/android/src/main/kotlin/convention.android-library.gradle.kts
@@ -19,4 +19,15 @@ android {
             ignore = true
         }
     }
+
+    compileOptions {
+        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+    }
+}
+
+tasks.withType<KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
 }
diff --git a/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts b/build-logic/kotlin/src/main/kotlin/convention.kotlin-base.gradle.kts
@@ -21,6 +21,6 @@ tasks.withType<KotlinCompile>().configureEach {
 }
 
 tasks.withType<JavaCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_11.toString()
-    targetCompatibility = JavaVersion.VERSION_11.toString()
+    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
+    targetCompatibility = JavaVersion.VERSION_1_8.toString()
 }