Skip to content

chore: bump plugins to Kotlin 2.3.0 and migrate to compilerOptions DSL #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Daniel-ADFA merged 1 commit into from
Apr 21, 2026
Merged

chore: bump plugins to Kotlin 2.3.0 and migrate to compilerOptions DSL #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/update-libs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 9 additions & 5 deletions Beepy/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -32,10 +34,6 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = "17"
}

packaging {
resources {
excludes += setOf(
Expand All @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Beepy/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down
15 changes: 9 additions & 6 deletions apk-viewer/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -31,11 +33,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}



packaging {
resources {
Expand All @@ -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")
}

Expand Down
2 changes: 1 addition & 1 deletion apk-viewer/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down
15 changes: 9 additions & 6 deletions keystore-generator/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -31,11 +33,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}



packaging {
resources {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion keystore-generator/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down
15 changes: 9 additions & 6 deletions markdown-preview/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -31,11 +33,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "17"
}



packaging {
resources {
Expand All @@ -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")

Expand Down
2 changes: 1 addition & 1 deletion markdown-preview/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down
11 changes: 7 additions & 4 deletions snippets/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
Expand Down Expand Up @@ -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")
}
2 changes: 1 addition & 1 deletion snippets/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}

Expand Down