From 029c786b2bd1b1d4e516b9a97453106a3369e9c7 Mon Sep 17 00:00:00 2001 From: kirich1409 Date: Mon, 9 Mar 2026 18:35:55 +0300 Subject: [PATCH 1/2] chore: add .worktrees/ to .gitignore Co-Authored-By: Claude Opus 4.6 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 489e3d0..aae09fb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ .externalNativeBuild .cxx firebase-debug.log +.worktrees/ From cd26a816ffcfb3bf01402e29fba3fd0333604be4 Mon Sep 17 00:00:00 2001 From: kirich1409 Date: Mon, 9 Mar 2026 18:44:00 +0300 Subject: [PATCH 2/2] chore: update all dependencies to latest versions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - AGP 8.8.0 → 9.1.0 (migrate to built-in Kotlin, remove kotlin-android plugin) - Kotlin 2.1.10 → 2.3.10 - Gradle wrapper 8.12.1 → 9.4.0 - compileSdk 35 → 36, minSdk 21 → 23, jvmTarget 11 → 17 - AndroidX: activity 1.10.0→1.12.4, core 1.15.0→1.17.0, appcompat 1.7.0→1.7.1, fragment 1.8.5→1.8.9, test-core 1.6.1→1.7.0, test-runner 1.6.2→1.7.0 - Remove deprecated android.defaults.buildfeatures.* properties - Add robolectric.properties (sdk=35) for all test modules - Remove deprecated kotlinOptions in favor of AGP 9 compilerOptions Co-Authored-By: Claude Opus 4.6 --- gradle.properties | 8 ------- .../vbpd/gradle/BaseExtensions.kt | 4 ---- .../src/main/kotlin/vbpdconfig.gradle.kts | 7 ------ gradle/libs.versions.toml | 24 +++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- sample/build.gradle.kts | 5 ---- .../src/test/resources/robolectric.properties | 1 + .../src/test/resources/robolectric.properties | 1 + .../src/test/resources/robolectric.properties | 1 + 9 files changed, 16 insertions(+), 37 deletions(-) create mode 100644 vbpd-core/src/test/resources/robolectric.properties create mode 100644 vbpd-reflection/src/test/resources/robolectric.properties create mode 100644 vbpd/src/test/resources/robolectric.properties diff --git a/gradle.properties b/gradle.properties index 1b1941c..f6e147b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,11 +19,3 @@ android.useAndroidX=true android.enableJetifier=false # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official - -android.defaults.buildfeatures.aidl=false -android.defaults.buildfeatures.buildconfig=false -android.defaults.buildfeatures.dataBinding=false -android.defaults.buildfeatures.renderscript=false -android.defaults.buildfeatures.resvalues=false -android.defaults.buildfeatures.shaders=false -android.defaults.buildfeatures.viewbinding=false diff --git a/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/dev/androidbroadcast/vbpd/gradle/BaseExtensions.kt b/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/dev/androidbroadcast/vbpd/gradle/BaseExtensions.kt index b7346b7..7de678a 100644 --- a/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/dev/androidbroadcast/vbpd/gradle/BaseExtensions.kt +++ b/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/dev/androidbroadcast/vbpd/gradle/BaseExtensions.kt @@ -24,10 +24,6 @@ fun Project.androidLibraryConfig(block: LibraryExtension.() -> Unit): Unit = blo fun Project.kotlinConfig(configure: Action): Unit = (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("kotlin", configure) -@Suppress("DEPRECATION") -fun LibraryExtension.kotlinOptions(configure: Action): Unit = - (this as org.gradle.api.plugins.ExtensionAware).extensions.configure("kotlinOptions", configure) - val Project.libs: LibrariesForLibs get() = the() diff --git a/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/vbpdconfig.gradle.kts b/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/vbpdconfig.gradle.kts index d2dcbd9..22348b1 100644 --- a/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/vbpdconfig.gradle.kts +++ b/gradle/conventions-plugins/vbpd-library-base/src/main/kotlin/vbpdconfig.gradle.kts @@ -1,12 +1,10 @@ import dev.androidbroadcast.vbpd.gradle.androidLibraryConfig import dev.androidbroadcast.vbpd.gradle.kotlinConfig -import dev.androidbroadcast.vbpd.gradle.kotlinOptions import dev.androidbroadcast.vbpd.gradle.libs version = libs.versions.vbpd.get() group = "dev.androidbroadcast.vbpd" -plugins.apply(libs.plugins.jetbrains.kotlin.android.get().pluginId) plugins.apply(libs.plugins.android.library.get().pluginId) plugins.apply("maven-publish") plugins.apply(libs.plugins.vanniktechMavenPublish.get().pluginId) @@ -42,11 +40,6 @@ androidLibraryConfig { targetCompatibility = javaVersion } - kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() - freeCompilerArgs += listOf("-module-name", libraryId) - } - testOptions { unitTests { isIncludeAndroidResources = true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7fb699b..8b0c291 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,26 +1,26 @@ [versions] -android-compileSdk = "35" -android-buildTools = "35.0.0" -android-minSdk = "21" +android-compileSdk = "36" +android-buildTools = "36.0.0" +android-minSdk = "23" android-targetSdk = "35" -agp = "8.8.0" -androidx-activity = "1.10.0" -androidx-core = "1.15.0" +agp = "9.1.0" +androidx-activity = "1.12.4" +androidx-core = "1.17.0" androidx-annotation = "1.9.1" -androidx-appcompat = "1.7.0" -androidx-fragment = "1.8.5" +androidx-appcompat = "1.7.1" +androidx-fragment = "1.8.9" androidx-recyclerview = "1.4.0" -kotlin = "2.1.10" +kotlin = "2.3.10" vanniktechMavenPublish = "0.30.0" -jvmTarget = "11" +jvmTarget = "17" vbpd = "2.0.4" detekt = "1.23.8" ktlint = "14.0.1" kover = "0.9.7" robolectric = "4.16.1" mockk = "1.14.9" -androidx-test-core = "1.6.1" -androidx-test-runner = "1.6.2" +androidx-test-core = "1.7.0" +androidx-test-runner = "1.7.0" junit = "4.13.2" [libraries] diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc25..dbc3ce4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index efcb322..cbabc64 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -1,5 +1,4 @@ plugins { - alias(libs.plugins.jetbrains.kotlin.android) alias(libs.plugins.android.application) alias(libs.plugins.parcelize) } @@ -22,10 +21,6 @@ android { targetCompatibility = JavaVersion.toVersion(libs.versions.jvmTarget.get()) } - kotlinOptions { - jvmTarget = libs.versions.jvmTarget.get() - } - buildFeatures { viewBinding = true } diff --git a/vbpd-core/src/test/resources/robolectric.properties b/vbpd-core/src/test/resources/robolectric.properties new file mode 100644 index 0000000..3f67ea5 --- /dev/null +++ b/vbpd-core/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=35 diff --git a/vbpd-reflection/src/test/resources/robolectric.properties b/vbpd-reflection/src/test/resources/robolectric.properties new file mode 100644 index 0000000..3f67ea5 --- /dev/null +++ b/vbpd-reflection/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=35 diff --git a/vbpd/src/test/resources/robolectric.properties b/vbpd/src/test/resources/robolectric.properties new file mode 100644 index 0000000..3f67ea5 --- /dev/null +++ b/vbpd/src/test/resources/robolectric.properties @@ -0,0 +1 @@ +sdk=35