diff --git a/.github/workflows/update-libs.yml b/.github/workflows/update-libs.yml index 0c191f97..2fec31ee 100644 --- a/.github/workflows/update-libs.yml +++ b/.github/workflows/update-libs.yml @@ -64,6 +64,13 @@ jobs: path: keystore-generator/build/plugin/*.cgp if-no-files-found: error + - name: Upload snippets CGP + uses: actions/upload-artifact@v4 + with: + name: snippets + path: snippets/build/plugin/*.cgp + if-no-files-found: error + - name: Commit updated jars run: | sha=$(git -C .cache/CodeOnTheGo rev-parse --short HEAD) diff --git a/Beepy/build.gradle.kts b/Beepy/build.gradle.kts index 44a66ee7..8460e150 100644 --- a/Beepy/build.gradle.kts +++ b/Beepy/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -32,10 +34,6 @@ android { targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } - packaging { resources { excludes += setOf( @@ -50,13 +48,19 @@ android { } } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } +} + dependencies { compileOnly(files("../libs/plugin-api.jar")) implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.10.0") implementation("androidx.fragment:fragment-ktx:1.8.8") - implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.0") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0") } tasks.wrapper { diff --git a/Beepy/settings.gradle.kts b/Beepy/settings.gradle.kts index ba12c9e2..ec6e32e4 100644 --- a/Beepy/settings.gradle.kts +++ b/Beepy/settings.gradle.kts @@ -15,7 +15,7 @@ buildscript { classpath(files("../libs/plugin-api.jar")) classpath(files("../libs/gradle-plugin.jar")) classpath("com.android.tools.build:gradle:8.11.0") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0") } } diff --git a/apk-viewer/build.gradle.kts b/apk-viewer/build.gradle.kts index 2065fd74..3160d133 100644 --- a/apk-viewer/build.gradle.kts +++ b/apk-viewer/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -31,11 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } - - packaging { resources { @@ -51,13 +48,19 @@ android { } } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } +} + dependencies { compileOnly(files("../libs/plugin-api.jar")) implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.10.0") implementation("androidx.fragment:fragment-ktx:1.8.8") - implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.21") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0") implementation("androidx.fragment:fragment:1.8.8") } diff --git a/apk-viewer/settings.gradle.kts b/apk-viewer/settings.gradle.kts index 1b2bb00e..2745fcaf 100644 --- a/apk-viewer/settings.gradle.kts +++ b/apk-viewer/settings.gradle.kts @@ -15,7 +15,7 @@ buildscript { classpath(files("../libs/plugin-api.jar")) classpath(files("../libs/gradle-plugin.jar")) classpath("com.android.tools.build:gradle:8.11.0") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0") } } diff --git a/keystore-generator/build.gradle.kts b/keystore-generator/build.gradle.kts index f39ceac6..cd5c4349 100644 --- a/keystore-generator/build.gradle.kts +++ b/keystore-generator/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -31,11 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } - - packaging { resources { @@ -51,13 +48,19 @@ android { } } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } +} + dependencies { compileOnly(files("../libs/plugin-api.jar")) implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.10.0") implementation("androidx.fragment:fragment-ktx:1.8.8") - implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.21") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0") implementation("androidx.fragment:fragment:1.8.8") // BouncyCastle for keystore generation diff --git a/keystore-generator/settings.gradle.kts b/keystore-generator/settings.gradle.kts index 72960807..5ba0ac0e 100644 --- a/keystore-generator/settings.gradle.kts +++ b/keystore-generator/settings.gradle.kts @@ -15,7 +15,7 @@ buildscript { classpath(files("../libs/plugin-api.jar")) classpath(files("../libs/gradle-plugin.jar")) classpath("com.android.tools.build:gradle:8.11.0") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0") } } diff --git a/markdown-preview/build.gradle.kts b/markdown-preview/build.gradle.kts index 56638c81..5be08435 100644 --- a/markdown-preview/build.gradle.kts +++ b/markdown-preview/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -31,11 +33,6 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } - kotlinOptions { - jvmTarget = "17" - } - - packaging { resources { @@ -51,13 +48,19 @@ android { } } +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) + } +} + dependencies { compileOnly(files("../libs/plugin-api.jar")) implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.10.0") implementation("androidx.fragment:fragment-ktx:1.8.8") - implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.21") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0") implementation("androidx.fragment:fragment:1.8.8") implementation("androidx.webkit:webkit:1.9.0") diff --git a/markdown-preview/settings.gradle.kts b/markdown-preview/settings.gradle.kts index d19b8f54..dcd2994b 100644 --- a/markdown-preview/settings.gradle.kts +++ b/markdown-preview/settings.gradle.kts @@ -15,7 +15,7 @@ buildscript { classpath(files("../libs/plugin-api.jar")) classpath(files("../libs/gradle-plugin.jar")) classpath("com.android.tools.build:gradle:8.11.0") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0") } } diff --git a/snippets/build.gradle.kts b/snippets/build.gradle.kts index e15950af..31834263 100644 --- a/snippets/build.gradle.kts +++ b/snippets/build.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + plugins { id("com.android.application") id("org.jetbrains.kotlin.android") @@ -31,20 +33,21 @@ android { sourceCompatibility = JavaVersion.VERSION_17 targetCompatibility = JavaVersion.VERSION_17 } +} - kotlinOptions { - jvmTarget = "17" +kotlin { + compilerOptions { + jvmTarget.set(JvmTarget.JVM_17) } } dependencies { - compileOnly(files("../libs/plugin-api.jar")) implementation("androidx.appcompat:appcompat:1.6.1") implementation("com.google.android.material:material:1.10.0") implementation("androidx.fragment:fragment-ktx:1.8.8") implementation("androidx.fragment:fragment:1.8.8") - implementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.21") + implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0") implementation("com.google.code.gson:gson:2.10.1") } \ No newline at end of file diff --git a/snippets/settings.gradle.kts b/snippets/settings.gradle.kts index 5e59ca54..56e6264a 100644 --- a/snippets/settings.gradle.kts +++ b/snippets/settings.gradle.kts @@ -16,7 +16,7 @@ buildscript { classpath(files("../libs/plugin-api.jar")) classpath(files("../libs/gradle-plugin.jar")) classpath("com.android.tools.build:gradle:8.11.0") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0") } }