Merge pull request #15 from babydots/bump-target-sdk

Bump target SDK + deps + tools. Bump for release v0.9.1
babydots · Jul 13, 2023 · 21c80f4 · 21c80f4
2 parents c1ae968 + 27d3306
commit 21c80f4
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 31 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -17,5 +17,9 @@ jobs:
       uses: actions/setup-java@v1
       with:
         java-version: 11
-    - name: Gradle build
+    - name: Build Android app
       run: ./gradlew :android:build
+    - name: Build web app
+      run: ./gradlew :web:build
+    - name: Build cli app
+      run: ./gradlew :cli:build
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,19 +1,18 @@
 plugins {
     id 'com.android.application'
     id 'kotlin-android'
-    id 'kotlin-android-extensions'
     id 'kotlin-kapt'
 }
 
 android {
-    compileSdk 31
+    compileSdk 33
 
     defaultConfig {
         applicationId "com.serwylo.babybook"
         minSdk 21
-        targetSdk 31
-        versionCode 10
-        versionName "0.9.0"
+        targetSdk 33
+        versionCode 11
+        versionName "0.9.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -62,24 +61,24 @@ dependencies {
     implementation project(":library")
     implementation 'com.github.babydots:immersivelock:1.0.1'
 
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
 
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.core:core-ktx:1.7.0'
-    implementation 'androidx.appcompat:appcompat:1.4.1'
-    implementation 'androidx.compose.material:material:1.1.0'
-    implementation 'com.google.android.material:material:1.5.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.compose.material:material:1.4.3'
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.annotation:annotation:1.6.0'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 
-    def room_version = '2.4.1'
+    def room_version = '2.5.2'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -88,18 +87,18 @@ dependencies {
     implementation "com.google.dagger:dagger:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
-    def lifecycle_version = '2.4.0'
+    def lifecycle_version = '2.6.1'
     implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$lifecycle_version"
 
-    def activity_version = "1.4.0"
-    implementation("androidx.activity:activity-ktx:$activity_version")
+    def activity_version = "1.7.2"
+    implementation("androidx.activity:activity-ktx:1.7.2")
 
     def fragment_version = "1.4.0"
-    implementation("androidx.fragment:fragment-ktx:$fragment_version")
+    implementation("androidx.fragment:fragment-ktx:1.6.0")
 
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta01")
+    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
 
     implementation 'com.squareup.picasso:picasso:2.8'
 

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -4,6 +4,10 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <!-- Not really used - but because the picasso library potentially needs it
+         (under circumstances not triggered by this app) it is required on SDK 33 -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"

diff --git a/android/src/main/java/com/serwylo/babybook/bookviewer/BookViewerActivity.kt b/android/src/main/java/com/serwylo/babybook/bookviewer/BookViewerActivity.kt
@@ -153,6 +153,7 @@ class BookViewerActivity : AppCompatActivity() {
         startActivityForResult(intent, RESULT_CREATE_FILE)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, resultData: Intent?) {
         super.onActivityResult(requestCode, resultCode, resultData)
 

diff --git a/android/src/main/java/com/serwylo/babybook/onboarding/OnboardingActivity.kt b/android/src/main/java/com/serwylo/babybook/onboarding/OnboardingActivity.kt
@@ -66,6 +66,7 @@ class OnboardingActivity : FragmentActivity() {
         binding.pager.unregisterOnPageChangeCallback(onPageChange)
     }
 
+    @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
         if (binding.pager.currentItem == 0) {
             super.onBackPressed()

diff --git a/build.gradle b/build.gradle
@@ -5,8 +5,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.0.4"
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/cli/build.gradle b/cli/build.gradle
@@ -12,7 +12,7 @@ dependencies {
     implementation project(":library")
 
     implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
 
 }
 

diff --git a/fastlane/metadata/android/en-US/changelogs/11.txt b/fastlane/metadata/android/en-US/changelogs/11.txt
@@ -0,0 +1 @@
+Bump target SDK to latest version.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Jan 14 21:19:08 AEDT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
@@ -12,7 +12,7 @@ dependencies {
 
 	implementation 'com.google.code.gson:gson:2.8.9'
 
-	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
 
 	implementation "io.ktor:ktor-client-core:1.6.3"
 	implementation "io.ktor:ktor-client-cio:1.6.3"

diff --git a/web/build.gradle b/web/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     implementation "io.ktor:ktor-gson:1.6.3"
     implementation "ch.qos.logback:logback-classic:1.2.5"
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
 
 }