Merge pull request #21 from Commencis/improvement/configuration-cache-compat

Make keepSecrets task compatible with configuration cache

Author: agabeyalioglu

gradle/libs.versions.toml

@@ -1,9 +1,10 @@
 [versions]
-kotlin = "1.8.21"
-androidGradlePlugin = "8.0.1"
+kotlin = "2.2.21"
+androidGradlePlugin = "8.13.1"
 gradlePublish = "1.2.0"
-detekt = "1.22.0"
+detekt = "1.23.8"
 kotlinxSerializationJson = "1.5.1"
+jvmTarget = "17"
 
 [libraries]
 # Android Gradle Api Plugin
@@ -17,7 +18,7 @@ detekt-formating = { group = "io.gitlab.arturbosch.detekt", name = "detekt-forma
 detekt-rules = { group = "io.gitlab.arturbosch.detekt", name = "detekt-rules", version.ref = "detekt" }
 
 # Sample App
-androidx-activityKtx = { module = "androidx.activity:activity-ktx", version = "1.7.2" }
+androidx-activityKtx = { module = "androidx.activity:activity-ktx", version = "1.12.0" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -28,4 +29,4 @@ gradle-publish = { id = "com.gradle.plugin-publish", version.ref = "gradlePublis
 detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
 
 [bundles]
-detekt = ["detekt.formating", "detekt.rules"]
+detekt = ["detekt-formating", "detekt-rules"]

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sampleapp/build.gradle.kts

@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -8,12 +6,12 @@ plugins {
 
 android {
     namespace = "com.commencis.secretsvaultplugin.sampleapp"
-    compileSdk = 33
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.commencis.secretsvaultplugin.sampleapp"
-        minSdk = 21
-        targetSdk = 33
+        minSdk = 23
+        targetSdk = 36
         versionCode = 1
         versionName = "1.0"
 
@@ -50,11 +48,6 @@ android {
         }
     }
 
-    compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
-    }
-
     externalNativeBuild {
         cmake {
             path("src/main/cpp/CMakeLists.txt")
@@ -80,9 +73,11 @@ android {
             }
         }
     }
+}
 
-    kotlinOptions {
-        jvmTarget = JvmTarget.JVM_11.target
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get()))
     }
 }
 

sampleapp/src/main/kotlin/com/commencis/secretsvaultplugin/sampleapp/MainActivity.kt

@@ -6,6 +6,9 @@ import android.view.ViewGroup
 import android.widget.ScrollView
 import android.widget.TextView
 import androidx.activity.ComponentActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updateLayoutParams
 
 internal class MainActivity : ComponentActivity() {
 
@@ -51,6 +54,18 @@ internal class MainActivity : ComponentActivity() {
                 ViewGroup.LayoutParams.MATCH_PARENT,
             )
         )
+
+        ViewCompat.setOnApplyWindowInsetsListener(scrollView) { v, windowInsets ->
+            val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                topMargin = insets.top
+                leftMargin = insets.left
+                bottomMargin = insets.bottom
+                rightMargin = insets.right
+            }
+            WindowInsetsCompat.CONSUMED
+        }
+
     }
 
 }

secretsvaultplugin/build.gradle.kts

@@ -1,6 +1,4 @@
 import io.gitlab.arturbosch.detekt.extensions.DetektExtension
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.gradle.publish)
@@ -17,13 +15,8 @@ dependencies {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
-tasks.withType<KotlinCompile>().configureEach {
-    compilerOptions {
-        jvmTarget.set(JvmTarget.JVM_11)
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(libs.versions.jvmTarget.get()))
     }
 }