chore: migrated to KTX and version catalogue (#90)

* chore: migrated to KTS and Version Catalogue

* chore: fixed deprecation

* chore: upgraded Java version

* chore: upgraded Java version

* chore: upgraded Java version

* chore: upgraded Java version

.github/workflows/release.yml

@@ -24,6 +24,12 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
+    - name: Set up JDK 17
+      uses: actions/[email protected]
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
     - name: Copy secrets to gradle.properties
       run: |
         sed -i -e "s,gradle.publish.key=,gradle.publish.key=$GRADLE_PUBLISH_KEY,g" gradle.properties

.github/workflows/test.yml

@@ -31,6 +31,12 @@ jobs:
     - name: Checkout Repo
       uses: actions/checkout@v2
 
+    - name: Set up JDK 17
+      uses: actions/[email protected]
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
     - name: Run tests
       run: |
         echo "Running unit tests"

build.gradle.kts

@@ -0,0 +1,48 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+buildscript {
+
+    repositories {
+        mavenLocal()
+        google()
+        mavenCentral()
+        maven {
+            url = uri("https://maven.pkg.github.com/google/secrets-gradle-plugin")
+            credentials {
+                username = project.findProperty("ghGprUser") as String? ?: System.getenv("ghGprUser")
+                password = project.findProperty("ghGprToken") as String? ?: System.getenv("ghGprToken")
+            }
+        }
+    }
+
+    dependencies {
+        classpath(libs.gradle.v842)
+        classpath(libs.kotlin.gradle.plugin)
+        classpath(libs.secrets.gradle.plugin)
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle.kts files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}

gradle.properties

@@ -25,3 +25,6 @@ gradle.publish.secret=
 
 ghGprUser=
 ghGprToken=
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/libs.versions.toml

@@ -0,0 +1,21 @@
+[versions]
+gradle = "7.0.4"
+gradleVersion = "8.4.2"
+junit = "4.13.2"
+kotlin = "1.9.24"
+kotlinGradlePlugin = "2.0.0"
+material = "1.12.0"
+appcompat = "1.7.0"
+mockitoKotlin = "2.2.0"
+secretsGradlePlugin = "2.0.1"
+
+[libraries]
+gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
+gradle-v842 = { module = "com.android.tools.build:gradle", version.ref = "gradleVersion" }
+junit = { module = "junit:junit", version.ref = "junit" }
+kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinGradlePlugin" }
+kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
+material = { group = "com.google.android.material", name = "material", version.ref = "material" }
+appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
+mockito-kotlin = { module = "com.nhaarman.mockitokotlin2:mockito-kotlin", version.ref = "mockitoKotlin" }
+secrets-gradle-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secretsGradlePlugin" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Nov 26 22:14:52 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample-app/build.gradle.kts

@@ -21,26 +21,30 @@ plugins {
 }
 
 android {
-    compileSdk = 32
-    buildToolsVersion = "30.0.3"
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.google.secrets_plugin.sample"
         minSdk = 21
-        targetSdk = 32
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
+    namespace = "com.google.secrets_plugin.sample"
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21")
-    implementation("com.google.android.material:material:1.6.1")
-    implementation("androidx.appcompat:appcompat:1.4.2")
+    implementation(libs.kotlin.stdlib)
+    implementation(libs.material)
+    implementation(libs.appcompat)
 }
 
 // 2. Optionally configure the plugin

sample-app/src/main/AndroidManifest.xml

@@ -15,8 +15,7 @@
  limitations under the License.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.secrets_plugin.sample">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

secrets-gradle-plugin/build.gradle.kts

@@ -19,16 +19,16 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
-    compileOnly("com.android.tools.build:gradle:7.0.0")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10")
-    testImplementation("com.android.tools.build:gradle:7.0.0-beta04")
-    testImplementation("junit:junit:4.13.1")
-    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
+    compileOnly(libs.gradle)
+    implementation(libs.kotlin.stdlib)
+    testImplementation(libs.gradle)
+    testImplementation(libs.junit)
+    testImplementation(libs.mockito.kotlin)
 }
 
 gradlePlugin {