Remove debug values, use targetSdk 33

runningcode · Oct 23, 2023 · f4871f1 · f4871f1
1 parent f7086d5
commit f4871f1
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/fladle-plugin/build.gradle.kts b/fladle-plugin/build.gradle.kts
@@ -144,10 +144,12 @@ tasks.withType(ValidatePlugins::class.java).configureEach {
   enableStricterValidation.set(true)
 }
 
-// Ensure Java 8 Compatibility. See https://github.com/runningcode/fladle/issues/246
+// Ensure Java 11 Compatibility. See https://github.com/runningcode/fladle/issues/246
 tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java).configureEach {
   kotlinOptions {
     jvmTarget = "11"
+    languageVersion = "1.7"
+    apiVersion = "1.7"
   }
 }
 

diff --git a/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/VariantTests.kt b/fladle-plugin/src/test/java/com/osacky/flank/gradle/integration/VariantTests.kt
@@ -166,7 +166,7 @@ class VariantTests {
           defaultConfig {
               applicationId "com.osacky.flank.gradle.sample"
               minSdk 23
-              targetSdk 29
+              targetSdk 33
               versionCode 1
               versionName "1.0"
               testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -191,8 +191,6 @@ class VariantTests {
     if (dryRun) {
       arguments.add("--dry-run")
     }
-    // print directory structure for debugging
-    testProjectRoot.root.walkTopDown().forEach { println(it) }
     return testProjectRoot.gradleRunner()
       .withArguments(arguments)
       .build()

diff --git a/fladle-plugin/src/test/resources/android-library-project-flavors/build.gradle b/fladle-plugin/src/test/resources/android-library-project-flavors/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdk 33
     namespace = "com.osacky.flank.gradle.sample"
     defaultConfig {
-        targetSdk 29
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/fladle-plugin/src/test/resources/android-library-project/build.gradle b/fladle-plugin/src/test/resources/android-library-project/build.gradle
@@ -6,7 +6,7 @@ android {
     compileSdk 33
     namespace = "com.osacky.flank.gradle.sample"
     defaultConfig {
-        targetSdk 29
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/fladle-plugin/src/test/resources/android-project-flavors/build.gradle b/fladle-plugin/src/test/resources/android-project-flavors/build.gradle
@@ -9,7 +9,7 @@ android {
     defaultConfig {
         applicationId "com.osacky.flank.gradle.sample"
         minSdk 23
-        targetSdk 29
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/fladle-plugin/src/test/resources/android-project/build.gradle b/fladle-plugin/src/test/resources/android-project/build.gradle
@@ -4,12 +4,12 @@ plugins {
 }
 
 android {
-    compileSdkVersion 29
+    compileSdk 33
     namespace = "com.osacky.flank.gradle.sample"
     defaultConfig {
         applicationId "com.osacky.flank.gradle.sample"
-        minSdkVersion 23
-        targetSdkVersion 29
+        minSdk 23
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/fladle-plugin/src/test/resources/android-project2/build.gradle b/fladle-plugin/src/test/resources/android-project2/build.gradle
@@ -9,7 +9,7 @@ android {
     defaultConfig {
         applicationId "com.osacky.flank.gradle.sample"
         minSdk 23
-        targetSdk 29
+        targetSdk 33
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"