Skip to content

Commit 5ae1258

Browse files
authored
Merge pull request #154 from LDRAlighieri/update/gradle-9
Release 1.12.1. Min sdk now 23, gradle and agp 9.x, update kotlin, and other dependencies
2 parents 49e8bdb + e6515f4 commit 5ae1258

28 files changed

Lines changed: 57 additions & 46 deletions

File tree

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
# ChangeLog
22

33

4+
## Version 1.12.1
5+
6+
* Update: minSdk is now 23.
7+
* Update: Kotlin to v2.3.10.
8+
* Update: Gradle and AGP to v9.x
9+
* Update: Minor update of other libraries.
10+
11+
412
## Version 1.12.0
513

614
* Update: minSdk is now 21.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[![Corbind](logo.svg)](https://ldralighieri.github.io/Corbind)
22

3-
[![Kotlin Version](https://img.shields.io/badge/Kotlin-v2.2.10-blue.svg?logo=kotlin)](https://kotlinlang.org)
3+
[![Kotlin Version](https://img.shields.io/badge/Kotlin-v2.3.10-blue.svg?logo=kotlin)](https://kotlinlang.org)
44
[![Kotlin Coroutines Version](https://img.shields.io/badge/Coroutines-v1.10.2-blue.svg)](https://kotlinlang.org/docs/reference/coroutines-overview.html)
55
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
66

77
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/a1c9a1b1d1ce4ca7a201ab93492bf6e0)](https://app.codacy.com/gh/LDRAlighieri/Corbind)
8-
[![API](https://img.shields.io/badge/API-21%2B-brightgreen.svg)](https://developer.android.com/tools/releases/platforms?hl=ru#5.0)
8+
[![API](https://img.shields.io/badge/API-23%2B-brightgreen.svg)](https://developer.android.com/tools/releases/platforms?hl=ru#6.0)
99
[![Publish status](https://github.com/LDRAlighieri/Corbind/actions/workflows/publish.yml/badge.svg)](https://github.com/LDRAlighieri/Corbind/actions)
1010

1111
[![Google Dev Library](https://img.shields.io/badge/Google_DevLibrary-Corbind-blue)](https://devlibrary.withgoogle.com/products/android/repos/LDRAlighieri-Corbind)
@@ -54,15 +54,15 @@ Please consider giving this repository a star ⭐ if you like the project.
5454
Platform bindings:
5555
```kotlin
5656
dependencies {
57-
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2025.09.00"))
57+
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2026.02.00"))
5858
implementation("ru.ldralighieri.corbind:corbind")
5959
}
6060
```
6161

6262
AndroidX library bindings:
6363
```kotlin
6464
dependencies {
65-
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2025.09.00"))
65+
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2026.02.00"))
6666
implementation("ru.ldralighieri.corbind:corbind-activity")
6767
implementation("ru.ldralighieri.corbind:corbind-appcompat")
6868
implementation("ru.ldralighieri.corbind:corbind-core")
@@ -82,7 +82,7 @@ dependencies {
8282
Google 'material' library bindings:
8383
```kotlin
8484
dependencies {
85-
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2025.09.00"))
85+
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2026.02.00"))
8686
implementation("ru.ldralighieri.corbind:corbind-material")
8787
}
8888
```
@@ -94,7 +94,7 @@ repositories {
9494
}
9595

9696
dependencies {
97-
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2025.10.00-SNAPSHOT"))
97+
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2026.02.01-SNAPSHOT"))
9898
implementation("ru.ldralighieri.corbind:{module}")
9999
}
100100
```

build-logic/convention/build.gradle.kts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
/*
24
* Copyright 2022 Vladimir Raupov
35
*
@@ -21,8 +23,13 @@ plugins {
2123
group = "ru.ldralighieri.corbind.buildlogic"
2224

2325
java {
24-
toolchain {
25-
languageVersion = JavaLanguageVersion.of(21)
26+
sourceCompatibility = JavaVersion.VERSION_21
27+
targetCompatibility = JavaVersion.VERSION_21
28+
}
29+
30+
kotlin {
31+
compilerOptions {
32+
jvmTarget = JvmTarget.JVM_21
2633
}
2734
}
2835

build-logic/convention/src/main/kotlin/LibraryConventionPlugin.kt

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,32 +14,26 @@
1414
* limitations under the License.
1515
*/
1616

17-
import com.android.build.gradle.LibraryExtension
17+
import com.android.build.api.dsl.LibraryExtension
1818
import org.gradle.api.Plugin
1919
import org.gradle.api.Project
2020
import org.gradle.kotlin.dsl.configure
21-
import org.gradle.kotlin.dsl.provideDelegate
2221
import ru.ldralighieri.corbind.configureKotlinAndroid
2322

2423
@Suppress("unused")
2524
class LibraryConventionPlugin : Plugin<Project> {
25+
2626
override fun apply(target: Project) {
2727
with(target) {
28-
with(pluginManager) {
29-
apply("com.android.library")
30-
apply("kotlin-android")
31-
}
28+
pluginManager.apply("com.android.library")
3229

3330
extensions.configure<LibraryExtension> {
34-
val targetSdk: String by project
35-
3631
configureKotlinAndroid(this)
37-
defaultConfig.targetSdk = targetSdk.toInt()
3832

3933
buildTypes {
4034
release {
4135
isMinifyEnabled = false
42-
proguardFiles(getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro")
36+
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
4337
}
4438
}
4539
}

build-logic/convention/src/main/kotlin/SpotlessConventionPlugin.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import ru.ldralighieri.corbind.libs
2222

2323
@Suppress("unused")
2424
class SpotlessConventionPlugin : Plugin<Project> {
25+
2526
override fun apply(target: Project) {
2627
with(target) {
2728
pluginManager.apply("com.diffplug.spotless")

build-logic/convention/src/main/kotlin/ru/ldralighieri/corbind/Project+configureKotlinAndroid.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,18 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2525
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
2626

2727
internal fun Project.configureKotlinAndroid(
28-
extension: CommonExtension<*, *, *, *, *, *>,
28+
commonExtension: CommonExtension,
2929
) {
3030
val compileSdk: String by project
3131
val minSdk: String by project
3232

3333
val javaLanguageVersion: JavaLanguageVersion =
3434
JavaLanguageVersion.of(JavaVersion.VERSION_21.majorVersion)
3535

36-
extension.apply {
36+
commonExtension.apply {
3737
this.compileSdk = compileSdk.toInt()
3838

39-
defaultConfig {
39+
defaultConfig.apply {
4040
this.minSdk = minSdk.toInt()
4141
}
4242
}

build-logic/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
org.gradle.parallel=true
33
org.gradle.caching=true
44
org.gradle.configureondemand=true
5+
org.gradle.configuration-cache=true
6+
org.gradle.configuration-cache.parallel=true

corbind-activity/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ To add androidx activity bindings, import `corbind-activity` module:
55

66
```kotlin
77
dependencies {
8-
implementation("ru.ldralighieri.corbind:corbind-activity:1.12.0")
8+
implementation("ru.ldralighieri.corbind:corbind-activity:1.12.1")
99
}
1010
```
1111

corbind-appcompat/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ To add androidx appcompat bindings, import `corbind-appcompat` module:
55

66
```kotlin
77
dependencies {
8-
implementation("ru.ldralighieri.corbind:corbind-appcompat:1.12.0")
8+
implementation("ru.ldralighieri.corbind:corbind-appcompat:1.12.1")
99
}
1010
```
1111

corbind-bom/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ Corbind Libraries BOM (Bills of Materials).
55

66
```kotlin
77
dependencies {
8-
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2025.09.00"))
8+
implementation(platform("ru.ldralighieri.corbind:corbind-bom:2026.02.00"))
99
}
1010
```

0 commit comments

Comments
 (0)