Merge pull request #17 from babydots/bump-for-release-0.9.2

Bump target SDK and all other dependencies.

.github/workflows/android.yml

@@ -12,14 +12,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
+        distribution: 'temurin'
     - name: Build Android app
       run: ./gradlew :android:build
-    - name: Build web app
-      run: ./gradlew :web:build
-    - name: Build cli app
-      run: ./gradlew :cli:build
+    # Disable for now until needed. Need to get android built to bump target SDK or else Google Play will be unhappy. Others can wait.
+    #  - name: Build web app
+    # run: ./gradlew :web:build
+    # - name: Build cli app
+    # run: ./gradlew :cli:build

android/build.gradle

@@ -5,14 +5,15 @@ plugins {
 }
 
 android {
-    compileSdk 33
+    compileSdk 34
+    namespace "com.serwylo.babybook"
 
     defaultConfig {
         applicationId "com.serwylo.babybook"
         minSdk 21
-        targetSdk 33
-        versionCode 11
-        versionName "0.9.1"
+        targetSdk 34
+        versionCode 12
+        versionName "0.9.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -48,37 +49,37 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 }
 
 dependencies {
 
     implementation project(":library")
-    implementation 'com.github.babydots:immersivelock:1.0.1'
+    implementation 'com.github.babydots:immersivelock:1.0.2'
 
-    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 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.4'
 
-    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.core:core-ktx:1.13.1'
+    implementation 'androidx.core:core-ktx:1.13.1'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.compose.material:material:1.6.8'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation 'androidx.annotation:annotation:1.6.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
+    implementation 'androidx.annotation:annotation:1.8.2'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
-    def room_version = '2.5.2'
+    def room_version = '2.6.1'
     implementation "androidx.room:room-runtime:$room_version"
     implementation "androidx.room:room-ktx:$room_version"
     kapt "androidx.room:room-compiler:$room_version"
@@ -87,24 +88,22 @@ dependencies {
     implementation "com.google.dagger:dagger:$dagger_version"
     kapt "com.google.dagger:dagger-compiler:$dagger_version"
 
-    def lifecycle_version = '2.6.1'
+    def lifecycle_version = '2.8.4'
     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.7.2"
-    implementation("androidx.activity:activity-ktx:1.7.2")
+    implementation("androidx.activity:activity-ktx:1.9.1")
 
-    def fragment_version = "1.4.0"
-    implementation("androidx.fragment:fragment-ktx:1.6.0")
+    implementation("androidx.fragment:fragment-ktx:1.8.2")
 
-    implementation("androidx.viewpager2:viewpager2:1.1.0-beta02")
+    implementation("androidx.viewpager2:viewpager2:1.1.0")
 
     implementation 'com.squareup.picasso:picasso:2.8'
 
     implementation 'com.tbuonomo:dotsindicator:4.2'
 
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
 
     implementation 'io.github.tonnyl:whatsnew:0.1.7'
 

android/src/main/java/com/serwylo/babybook/booklist/BookListFragment.kt

@@ -31,7 +31,7 @@ class BookListFragment : Fragment() {
     ): View {
         val binding = FragmentBookListBinding.inflate(inflater, container, false)
 
-        viewModel.isInEditMode.observe(this) { isInEditMode ->
+        viewModel.isInEditMode.observe(viewLifecycleOwner) { isInEditMode ->
             binding.editMode.visibility = if (isInEditMode) View.VISIBLE else View.GONE
             binding.addBookButton.visibility = if (isInEditMode) View.VISIBLE else View.GONE
         }
@@ -45,7 +45,7 @@ class BookListFragment : Fragment() {
             else -> GridLayoutManager(context, columnCount)
         }
 
-        binding.list.adapter = BookListAdapter(context!!).also { adapter ->
+        binding.list.adapter = BookListAdapter(requireContext()).also { adapter ->
 
             adapter.setBookSelectedListener { book ->
 

android/src/main/java/com/serwylo/babybook/onboarding/OnboardingFragment.kt

@@ -55,7 +55,7 @@ class OnboardingFragment(
 
         binding.title.text = title
         binding.description.text = description
-        binding.image.setImageDrawable(AppCompatResources.getDrawable(context!!, drawableRes))
+        binding.image.setImageDrawable(AppCompatResources.getDrawable(requireContext(), drawableRes))
 
         return binding.root
     }

build.gradle

@@ -5,17 +5,17 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.2.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
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
 // For heroku deployments.
-task stage(dependsOn: [':web:dist'])
+tasks.register('stage') { dependsOn[':web:dist'] }

cli/build.gradle

@@ -3,33 +3,34 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
 
     implementation project(":library")
 
     implementation "org.jetbrains.kotlinx:kotlinx-cli:0.3.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
 
 }
 
 project.ext.mainClassName = "com.serwylo.babybook.cli.ApplicationKt"
 
-task run(dependsOn: classes, type: JavaExec) {
-    main = project.mainClassName
+tasks.register('run', JavaExec) {
+    dependsOn classes
+    mainClass = project.mainClassName
     classpath = sourceSets.main.runtimeClasspath
     standardInput = System.in
 }
 
-task dist(type: Jar) {
+tasks.register('dist', Jar) {
     manifest {
         attributes 'Main-Class': project.mainClassName
     }
     duplicatesStrategy("exclude")
-    dependsOn [
+    dependsOn[
             configurations.runtimeClasspath,
             classes,
     ]

client/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'org.siouan.frontend-jdk11'
+    id 'org.siouan.frontend-jdk17' version "8.1.0"
 }
 
 frontend {

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

@@ -0,0 +1 @@
+Bump target SDK to latest version.

gradle.properties

@@ -18,4 +18,6 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
+kotlin.code.style=official
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

library/build.gradle

@@ -4,15 +4,15 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
 
-	implementation 'com.google.code.gson:gson:2.8.9'
+	implementation 'com.google.code.gson:gson:2.10'
 
-	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4"
+	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3"
 
 	implementation "io.ktor:ktor-client-core:1.6.3"
 	implementation "io.ktor:ktor-client-cio:1.6.3"

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id 'org.siouan.frontend-jdk11' version '6.0.0'
+        id 'org.siouan.frontend-jdk17' version '8.1.0'
     }
     repositories {
         gradlePluginPortal()