Skip to content

Commit b399400

Browse files
committed
Merge branch 'release/2.3.2'
2 parents 2929de0 + 3744575 commit b399400

File tree

13 files changed

+269
-180
lines changed

13 files changed

+269
-180
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# CHANGELOG
22

3+
## 2.3.2 (2024-09-05)
4+
* bump Gradle plugin to 8.7.2, Kotlin to 2.0.20
5+
* bump buildToolsVersion 35.0.0, targetSdkVersion, compileSdkVersion to 35
6+
* bump core-ktx to 1.15.0, recyclerview to 1.3.2
7+
38
## 2.3.1 (2023-08-31)
49
* bump recyclerView to 1.3.1
510
* bump Gradle plugin to 8.1.1, Kotlin to 1.9.0

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ android {
4444
}
4545

4646
dependencies {
47-
implementation 'androidx.appcompat:appcompat:1.6.1'
48-
implementation 'androidx.recyclerview:recyclerview:1.3.1'
47+
implementation 'androidx.appcompat:appcompat:1.7.0'
48+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
4949
implementation project(":properbaseadapter")
5050

51-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
51+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
5252

5353
testImplementation 'junit:junit:4.13.2'
54-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
55-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
54+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
55+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
5656
}

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
buildscript {
22
ext {
3-
kotlin_version = '1.9.0' /* https://github.com/JetBrains/kotlin */
4-
dokka_version = '1.8.20' /* https://github.com/Kotlin/dokka/releases */
3+
kotlin_version = '2.0.20' /* https://github.com/JetBrains/kotlin */
4+
dokka_version = '1.9.20' /* https://github.com/Kotlin/dokka/releases */
55
}
66

77
repositories {
@@ -10,7 +10,7 @@ buildscript {
1010
}
1111

1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:8.1.1'
13+
classpath 'com.android.tools.build:gradle:8.7.2'
1414
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1515
classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
1616
}
@@ -24,5 +24,5 @@ allprojects {
2424
}
2525

2626
tasks.register('clean', Delete) {
27-
delete rootProject.buildDir
27+
delete rootProject.layout.buildDirectory
2828
}

gradle-mvn-push.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'
33
tasks.register('javadocJar', Jar) {
44
dependsOn dokkaJavadoc
55
archiveClassifier.set('javadoc')
6-
from "$buildDir/dokka/javadoc"
6+
from "${rootProject.layout.buildDirectory}/dokka/javadoc"
77
}
88

99
afterEvaluate {

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ android.enableJetifier=true
2121
kotlin.code.style=official
2222

2323
# base versions
24-
buildToolsVersion=34.0.0
25-
compileSdkVersion=34
24+
buildToolsVersion=35.0.0
25+
compileSdkVersion=35
2626
minSdkVersion=21
27-
targetSdkVersion=34
27+
targetSdkVersion=35
2828
javaVersion=17

gradle/wrapper/gradle-wrapper.jar

-10.6 KB
Binary file not shown.
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue Aug 29 13:03:29 CEST 2023
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)