Skip to content

Commit 9d43b9b

Browse files
pserwylopserwylo
committed
Bump target SDK and all other dependencies.
1 parent 21c80f4 commit 9d43b9b

File tree

14 files changed

+107
-63
lines changed

14 files changed

+107
-63
lines changed

‎.idea/compiler.xml

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/deploymentTargetDropDown.xml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/migrations.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/build.gradle

Lines changed: 27 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ plugins {
55
}
66

77
android {
8-
compileSdk 33
8+
compileSdk 34
9+
namespace "com.serwylo.babybook"
910

1011
defaultConfig {
1112
applicationId "com.serwylo.babybook"
1213
minSdk 21
13-
targetSdk 33
14-
versionCode 11
15-
versionName "0.9.1"
14+
targetSdk 34
15+
versionCode 12
16+
versionName "0.9.2"
1617

1718
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1819

@@ -48,37 +49,37 @@ android {
4849
}
4950
}
5051
compileOptions {
51-
sourceCompatibility JavaVersion.VERSION_1_8
52-
targetCompatibility JavaVersion.VERSION_1_8
52+
sourceCompatibility JavaVersion.VERSION_17
53+
targetCompatibility JavaVersion.VERSION_17
5354
}
5455
kotlinOptions {
55-
jvmTarget = '1.8'
56+
jvmTarget = '17'
5657
}
5758
}
5859

5960
dependencies {
6061

6162
implementation project(":library")
62-
implementation 'com.github.babydots:immersivelock:1.0.1'
63+
implementation 'com.github.babydots:immersivelock:1.0.2'
6364

64-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
65-
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
66-
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
65+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
66+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
67+
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
6768

68-
implementation 'androidx.core:core-ktx:1.10.1'
69-
implementation 'androidx.core:core-ktx:1.10.1'
70-
implementation 'androidx.appcompat:appcompat:1.6.1'
71-
implementation 'androidx.compose.material:material:1.4.3'
72-
implementation 'com.google.android.material:material:1.9.0'
69+
implementation 'androidx.core:core-ktx:1.13.1'
70+
implementation 'androidx.core:core-ktx:1.13.1'
71+
implementation 'androidx.appcompat:appcompat:1.7.0'
72+
implementation 'androidx.compose.material:material:1.6.8'
73+
implementation 'com.google.android.material:material:1.12.0'
7374
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
7475
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
75-
implementation 'androidx.recyclerview:recyclerview:1.3.0'
76-
implementation 'androidx.annotation:annotation:1.6.0'
76+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
77+
implementation 'androidx.annotation:annotation:1.8.2'
7778
testImplementation 'junit:junit:4.13.2'
78-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
79-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
79+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
80+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
8081

81-
def room_version = '2.5.2'
82+
def room_version = '2.6.1'
8283
implementation "androidx.room:room-runtime:$room_version"
8384
implementation "androidx.room:room-ktx:$room_version"
8485
kapt "androidx.room:room-compiler:$room_version"
@@ -87,24 +88,22 @@ dependencies {
8788
implementation "com.google.dagger:dagger:$dagger_version"
8889
kapt "com.google.dagger:dagger-compiler:$dagger_version"
8990

90-
def lifecycle_version = '2.6.1'
91+
def lifecycle_version = '2.8.4'
9192
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
9293
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
9394
implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
9495

95-
def activity_version = "1.7.2"
96-
implementation("androidx.activity:activity-ktx:1.7.2")
96+
implementation("androidx.activity:activity-ktx:1.9.1")
9797

98-
def fragment_version = "1.4.0"
99-
implementation("androidx.fragment:fragment-ktx:1.6.0")
98+
implementation("androidx.fragment:fragment-ktx:1.8.2")
10099

101-
implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
100+
implementation("androidx.viewpager2:viewpager2:1.1.0")
102101

103102
implementation 'com.squareup.picasso:picasso:2.8'
104103

105104
implementation 'com.tbuonomo:dotsindicator:4.2'
106105

107-
implementation 'androidx.preference:preference-ktx:1.2.0'
106+
implementation 'androidx.preference:preference-ktx:1.2.1'
108107

109108
implementation 'io.github.tonnyl:whatsnew:0.1.7'
110109

‎build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@ buildscript {
55
mavenCentral()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.4.2'
8+
classpath 'com.android.tools.build:gradle:8.2.2'
99
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
1313
}
1414
}
1515

16-
task clean(type: Delete) {
16+
tasks.register('clean', Delete) {
1717
delete rootProject.buildDir
1818
}
1919

2020
// For heroku deployments.
21-
task stage(dependsOn: [':web:dist'])
21+
tasks.register('stage') { dependsOn[':web:dist'] }

‎cli/build.gradle

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,34 @@ plugins {
33
}
44

55
java {
6-
sourceCompatibility = JavaVersion.VERSION_1_8
7-
targetCompatibility = JavaVersion.VERSION_1_8
6+
sourceCompatibility = JavaVersion.VERSION_17
7+
targetCompatibility = JavaVersion.VERSION_17
88
}
99

1010
dependencies {
1111

1212
implementation project(":library")
1313

1414
implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.4"
15-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
15+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
1616

1717
}
1818

1919
project.ext.mainClassName = "com.serwylo.babybook.cli.ApplicationKt"
2020

21-
task run(dependsOn: classes, type: JavaExec) {
22-
main = project.mainClassName
21+
tasks.register('run', JavaExec) {
22+
dependsOn classes
23+
mainClass = project.mainClassName
2324
classpath = sourceSets.main.runtimeClasspath
2425
standardInput = System.in
2526
}
2627

27-
task dist(type: Jar) {
28+
tasks.register('dist', Jar) {
2829
manifest {
2930
attributes 'Main-Class': project.mainClassName
3031
}
3132
duplicatesStrategy("exclude")
32-
dependsOn [
33+
dependsOn[
3334
configurations.runtimeClasspath,
3435
classes,
3536
]

‎fastlane/metadata/android/en-US/changelogs/12.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Bump target SDK to latest version.

0 commit comments

Comments
 (0)