From 50c7b4a3be0c4061b726e80546c37b93268ba9f4 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Tue, 9 Jan 2024 21:01:20 -0500
Subject: [PATCH] refactor: Migrate to build.gradle.kts

...and rework the original "helper.gradle" into proper plugins. This
also allows the signing configuration code to be shared, and now
keystore.properties is no longer mandatory.
---
 .gitignore                                    |  1 +
 .idea/compiler.xml                            |  3 +
 .idea/gradle.xml                              |  1 +
 app-common/build.gradle                       | 48 -------------
 app-common/build.gradle.kts                   | 47 +++++++++++++
 app-unpriv/build.gradle                       | 62 ----------------
 app-unpriv/build.gradle.kts                   | 48 +++++++++++++
 app/build.gradle                              | 70 -------------------
 app/build.gradle.kts                          | 51 ++++++++++++++
 build.gradle                                  | 11 ---
 build.gradle.kts                              | 12 ++++
 buildSrc/build.gradle.kts                     | 12 ++++
 .../im/angry/openeuicc/build/Signing.kt       | 61 ++++++++++++++++
 .../im/angry/openeuicc/build/Versioning.kt    | 54 ++++++++++++++
 helpers.gradle                                | 27 -------
 libs/hidden-apis-shim/build.gradle            | 41 -----------
 libs/hidden-apis-shim/build.gradle.kts        | 40 +++++++++++
 .../{build.gradle => build.gradle.kts}        |  8 +--
 libs/lpac-jni/build.gradle                    | 52 --------------
 libs/lpac-jni/build.gradle.kts                | 50 +++++++++++++
 20 files changed, 384 insertions(+), 315 deletions(-)
 delete mode 100644 app-common/build.gradle
 create mode 100644 app-common/build.gradle.kts
 delete mode 100644 app-unpriv/build.gradle
 create mode 100644 app-unpriv/build.gradle.kts
 delete mode 100644 app/build.gradle
 create mode 100644 app/build.gradle.kts
 delete mode 100644 build.gradle
 create mode 100644 build.gradle.kts
 create mode 100644 buildSrc/build.gradle.kts
 create mode 100644 buildSrc/src/main/kotlin/im/angry/openeuicc/build/Signing.kt
 create mode 100644 buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt
 delete mode 100644 helpers.gradle
 delete mode 100644 libs/hidden-apis-shim/build.gradle
 create mode 100644 libs/hidden-apis-shim/build.gradle.kts
 rename libs/hidden-apis-stub/{build.gradle => build.gradle.kts} (51%)
 delete mode 100644 libs/lpac-jni/build.gradle
 create mode 100644 libs/lpac-jni/build.gradle.kts

diff --git a/.gitignore b/.gitignore
index b8588f9..f19884d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 .cxx
 local.properties
 /libs/**/build
+/buildSrc/build
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 3261b08..82920a5 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -5,6 +5,9 @@
       <module name="OpenEUICC.app" target="17" />
       <module name="OpenEUICC.app-common" target="17" />
       <module name="OpenEUICC.app-unpriv" target="17" />
+      <module name="OpenEUICC.buildSrc" target="17" />
+      <module name="OpenEUICC.buildSrc.main" target="17" />
+      <module name="OpenEUICC.buildSrc.test" target="17" />
       <module name="OpenEUICC.libs.hidden-apis-shim" target="17" />
       <module name="OpenEUICC.libs.lpac-jni" target="17" />
     </bytecodeTargetLevel>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6d63435..cb7a677 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -15,6 +15,7 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/app-common" />
             <option value="$PROJECT_DIR$/app-unpriv" />
+            <option value="$PROJECT_DIR$/buildSrc" />
             <option value="$PROJECT_DIR$/libs" />
             <option value="$PROJECT_DIR$/libs/hidden-apis-shim" />
             <option value="$PROJECT_DIR$/libs/hidden-apis-stub" />
diff --git a/app-common/build.gradle b/app-common/build.gradle
deleted file mode 100644
index deaa882..0000000
--- a/app-common/build.gradle
+++ /dev/null
@@ -1,48 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'im.angry.openeuicc.common'
-    compileSdk 34
-
-    defaultConfig {
-        minSdk 30
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-    implementation project(":libs:lpac-jni")
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    //noinspection KtxExtensionAvailable
-    implementation "androidx.preference:preference:1.2.1"
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.2'
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
-    implementation "androidx.cardview:cardview:1.0.0"
-    implementation "androidx.datastore:datastore-preferences:1.0.0"
-    implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
\ No newline at end of file
diff --git a/app-common/build.gradle.kts b/app-common/build.gradle.kts
new file mode 100644
index 0000000..4e3660d
--- /dev/null
+++ b/app-common/build.gradle.kts
@@ -0,0 +1,47 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "im.angry.openeuicc.common"
+    compileSdk = 34
+
+    defaultConfig {
+        minSdk = 30
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(project(":libs:lpac-jni"))
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.10.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    //noinspection KtxExtensionAvailable
+    implementation("androidx.preference:preference:1.2.1")
+    implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+    implementation("androidx.cardview:cardview:1.0.0")
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+    implementation("com.journeyapps:zxing-android-embedded:4.3.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}
\ No newline at end of file
diff --git a/app-unpriv/build.gradle b/app-unpriv/build.gradle
deleted file mode 100644
index 06597a1..0000000
--- a/app-unpriv/build.gradle
+++ /dev/null
@@ -1,62 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-
-apply from: '../helpers.gradle'
-
-def keystorePropertiesFile = rootProject.file("keystore.properties");
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-android {
-    namespace 'im.angry.easyeuicc'
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "im.angry.easyeuicc"
-        minSdk 30
-        targetSdk 34
-        versionCode getGitVersionCode()
-        versionName getGitVersionName()
-    }
-
-    signingConfigs {
-        config {
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-            keyAlias keystoreProperties['unprivKeyAlias']
-            keyPassword keystoreProperties['unprivKeyPassword']
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
-        }
-        debug {
-            debuggable false
-            signingConfig signingConfigs.config
-        }
-    }
-    applicationVariants.configureEach { variant ->
-        if (variant.name == "debug") {
-            variant.outputs.each { o -> o.versionCodeOverride = System.currentTimeSeconds() }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-    implementation project(":app-common")
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.11.0'
-}
\ No newline at end of file
diff --git a/app-unpriv/build.gradle.kts b/app-unpriv/build.gradle.kts
new file mode 100644
index 0000000..776590d
--- /dev/null
+++ b/app-unpriv/build.gradle.kts
@@ -0,0 +1,48 @@
+import im.angry.openeuicc.build.*
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+signingKeystoreProperties {
+    keyAliasField = "unprivKeyAlias"
+    keyPasswordField = "unprivKeyPassword"
+}
+
+apply {
+    plugin<MyVersioningPlugin>()
+    plugin<MySigningPlugin>()
+}
+
+android {
+    namespace = "im.angry.easyeuicc"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "im.angry.easyeuicc"
+        minSdk = 30
+        targetSdk = 34
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(project(":app-common"))
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.11.0")
+}
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index d6bad2a..0000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,70 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'org.jetbrains.kotlin.android'
-}
-
-apply from: '../helpers.gradle'
-
-// Signing config, mainly intended for debug builds
-def keystorePropertiesFile = rootProject.file("keystore.properties");
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-
-android {
-    compileSdk 34
-
-    defaultConfig {
-        applicationId "im.angry.openeuicc"
-        minSdk 30
-        targetSdk 34
-        versionCode getGitVersionCode()
-        versionName getGitVersionName()
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-    }
-
-    signingConfigs {
-        config {
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-        }
-    }
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.config
-        }
-        debug {
-            signingConfig signingConfigs.config
-        }
-    }
-    applicationVariants.configureEach { variant ->
-        if (variant.name == "debug") {
-            variant.outputs.each { o -> o.versionCodeOverride = System.currentTimeSeconds() }
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    namespace 'im.angry.openeuicc'
-}
-
-dependencies {
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.3.2'
-    compileOnly project(':libs:hidden-apis-stub')
-    implementation project(':libs:hidden-apis-shim')
-    implementation project(':libs:lpac-jni')
-    implementation project(":app-common")
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 0000000..24330cd
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,51 @@
+import im.angry.openeuicc.build.*
+
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+}
+
+apply {
+    plugin<MyVersioningPlugin>()
+    plugin<MySigningPlugin>()
+}
+
+android {
+    namespace = "im.angry.openeuicc"
+    compileSdk = 34
+
+    defaultConfig {
+        applicationId = "im.angry.openeuicc"
+        minSdk = 30
+        targetSdk = 34
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
+    compileOnly(project(":libs:hidden-apis-stub"))
+    implementation(project(":libs:hidden-apis-shim"))
+    implementation(project(":libs:lpac-jni"))
+    implementation(project(":app-common"))
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index b7f2df2..0000000
--- a/build.gradle
+++ /dev/null
@@ -1,11 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-plugins {
-    id 'com.android.application' version '8.1.2' apply false
-    id 'com.android.library' version '8.1.2' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.20' apply false
-    id 'org.jetbrains.kotlin.multiplatform' version '1.9.20' apply false
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 0000000..d683ac5
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,12 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+plugins {
+    // The following Android-related plugins are already depended upon by buildSrc, hence unnecessary.
+    // id("com.android.application") version "8.1.2" apply false
+    // id("com.android.library") version "8.1.2" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.20" apply false
+    id("org.jetbrains.kotlin.multiplatform") version "1.9.20" apply false
+}
+
+tasks.create<Delete>("clean") {
+    delete = setOf(rootProject.buildDir)
+}
\ No newline at end of file
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
new file mode 100644
index 0000000..15fa116
--- /dev/null
+++ b/buildSrc/build.gradle.kts
@@ -0,0 +1,12 @@
+repositories {
+    google()
+    gradlePluginPortal()
+}
+
+plugins {
+    `kotlin-dsl`
+}
+
+dependencies {
+    implementation("com.android.tools.build:gradle:8.1.2")
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Signing.kt b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Signing.kt
new file mode 100644
index 0000000..77ca8f1
--- /dev/null
+++ b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Signing.kt
@@ -0,0 +1,61 @@
+package im.angry.openeuicc.build
+
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import org.gradle.api.Action
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.*
+import java.io.FileInputStream
+import java.io.FileNotFoundException
+import java.util.Properties
+
+val Project.keystoreProperties: Properties?
+    get() {
+        try {
+            val keystorePropertiesFile = rootProject.file("keystore.properties")
+            return Properties().apply { load(FileInputStream(keystorePropertiesFile)) }
+        } catch (e: FileNotFoundException) {
+            return null
+        }
+    }
+
+interface KeystorePropertiesExtension {
+    var storeFileField: String?
+    var storePasswordField: String?
+    var keyAliasField: String?
+    var keyPasswordField: String?
+}
+
+fun Project.signingKeystoreProperties(_configure: Action<KeystorePropertiesExtension>) {
+    extensions.create<KeystorePropertiesExtension>("keystoreProperties")
+    configure<KeystorePropertiesExtension> {
+        _configure(this)
+    }
+}
+
+class MySigningPlugin: Plugin<Project> {
+    override fun apply(target: Project) {
+        val ext = target.extensions.findByType(KeystorePropertiesExtension::class.java)
+        target.configure<BaseAppModuleExtension> {
+            target.keystoreProperties?.let { keystore ->
+                signingConfigs {
+                    create("config") {
+                        storeFile = target.file(keystore[ext?.storeFileField ?: "storeFile"]!!)
+                        storePassword = keystore[ext?.storePasswordField ?: "storePassword"] as String?
+                        keyAlias = keystore[ext?.keyAliasField ?: "keyAlias"] as String?
+                        keyPassword = keystore[ext?.keyPasswordField ?: "keyPassword"] as String?
+                    }
+                }
+
+                buildTypes {
+                    debug {
+                        signingConfig = signingConfigs.getByName("config")
+                    }
+                    release {
+                        signingConfig = signingConfigs.getByName("config")
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt
new file mode 100644
index 0000000..2c77fd3
--- /dev/null
+++ b/buildSrc/src/main/kotlin/im/angry/openeuicc/build/Versioning.kt
@@ -0,0 +1,54 @@
+package im.angry.openeuicc.build
+
+import com.android.build.gradle.internal.api.ApkVariantOutputImpl
+import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+import org.gradle.kotlin.dsl.configure
+import java.io.ByteArrayOutputStream
+
+val Project.gitVersionCode: Int
+    get() =
+        try {
+            val stdout = ByteArrayOutputStream()
+            exec {
+                commandLine("git", "rev-list", "--first-parent", "--count", "master")
+                standardOutput = stdout
+            }
+            stdout.toString("utf-8").trim('\n').toInt()
+        } catch (e: Exception) {
+            0
+        }
+
+val Project.gitVersionName: String
+    get() =
+        try {
+            val stdout = ByteArrayOutputStream()
+            exec {
+                commandLine("git", "describe", "--always", "--tags", "--dirty")
+                standardOutput = stdout
+            }
+            stdout.toString("utf-8").trim('\n')
+        } catch (e: Exception) {
+            "Unknown"
+        }
+
+class MyVersioningPlugin: Plugin<Project> {
+    override fun apply(target: Project) {
+        target.configure<BaseAppModuleExtension> {
+            defaultConfig {
+                versionCode = target.gitVersionCode
+                versionName = target.gitVersionName
+            }
+
+            applicationVariants.all {
+                if (name == "debug") {
+                    outputs.forEach {
+                        (it as ApkVariantOutputImpl).versionCodeOverride =
+                            (System.currentTimeMillis() / 1000).toInt()
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/helpers.gradle b/helpers.gradle
deleted file mode 100644
index f71e632..0000000
--- a/helpers.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-ext.getGitVersionCode = { ->
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'rev-list', '--first-parent', '--count', 'master'
-            standardOutput = stdout
-        }
-        return Integer.parseInt(stdout.toString().trim())
-    }
-    catch (ignored) {
-        return -1;
-    }
-}
-
-ext.getGitVersionName = { ->
-    try {
-        def stdout = new ByteArrayOutputStream()
-        exec {
-            commandLine 'git', 'describe', '--always', '--tags', '--dirty'
-            standardOutput = stdout
-        }
-        return stdout.toString().trim()
-    }
-    catch (ignored) {
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/libs/hidden-apis-shim/build.gradle b/libs/hidden-apis-shim/build.gradle
deleted file mode 100644
index a3a0472..0000000
--- a/libs/hidden-apis-shim/build.gradle
+++ /dev/null
@@ -1,41 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    compileSdk 32
-
-    defaultConfig {
-        minSdk 30
-        targetSdk 32
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    namespace 'im.angry.openeuicc.hidden_apis_shim'
-}
-
-dependencies {
-    compileOnly project(':libs:hidden-apis-stub')
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    implementation 'com.google.android.material:material:1.6.1'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
-}
\ No newline at end of file
diff --git a/libs/hidden-apis-shim/build.gradle.kts b/libs/hidden-apis-shim/build.gradle.kts
new file mode 100644
index 0000000..e72fb67
--- /dev/null
+++ b/libs/hidden-apis-shim/build.gradle.kts
@@ -0,0 +1,40 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    compileSdk = 32
+
+    defaultConfig {
+        minSdk = 30
+        targetSdk = 32
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    namespace = "im.angry.openeuicc.hidden_apis_shim"
+}
+
+dependencies {
+    compileOnly(project(":libs:hidden-apis-stub"))
+    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.4.2")
+    implementation("com.google.android.material:material:1.6.1")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+}
\ No newline at end of file
diff --git a/libs/hidden-apis-stub/build.gradle b/libs/hidden-apis-stub/build.gradle.kts
similarity index 51%
rename from libs/hidden-apis-stub/build.gradle
rename to libs/hidden-apis-stub/build.gradle.kts
index 3b38b3d..1a938f0 100644
--- a/libs/hidden-apis-stub/build.gradle
+++ b/libs/hidden-apis-stub/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-    id 'com.android.library'
+    id("com.android.library")
 }
 
 android {
-    compileSdk 31
-    namespace 'im.angry.hidden.apis'
+    compileSdk = 31
+    namespace = "im.angry.hidden.apis"
 }
 
 java {
@@ -13,5 +13,5 @@ java {
 }
 
 dependencies {
-    implementation 'org.jetbrains:annotations:15.0'
+    implementation("org.jetbrains:annotations:15.0")
 }
\ No newline at end of file
diff --git a/libs/lpac-jni/build.gradle b/libs/lpac-jni/build.gradle
deleted file mode 100644
index 9faf136..0000000
--- a/libs/lpac-jni/build.gradle
+++ /dev/null
@@ -1,52 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'net.typeblog.lpac_jni'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 27
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles "consumer-rules.pro"
-
-        externalNativeBuild {
-            ndkBuild {
-                arguments '-j4'
-            }
-        }
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    externalNativeBuild {
-        ndkBuild {
-            path "src/main/jni/Android.mk"
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.0')
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-}
\ No newline at end of file
diff --git a/libs/lpac-jni/build.gradle.kts b/libs/lpac-jni/build.gradle.kts
new file mode 100644
index 0000000..62e576a
--- /dev/null
+++ b/libs/lpac-jni/build.gradle.kts
@@ -0,0 +1,50 @@
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "net.typeblog.lpac_jni"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 27
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+
+        externalNativeBuild {
+            ndkBuild {
+                arguments("-j4")
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
+        }
+    }
+    externalNativeBuild {
+        ndkBuild {
+            path("src/main/jni/Android.mk")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.12.0")
+    implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("com.google.android.material:material:1.10.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}
\ No newline at end of file