diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index f06ae9e..cbf56d0 100644
--- 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
index b6a688f..4bd4105 100644
--- 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
index 0e3ce9a..ebb2166 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -4,6 +4,10 @@
+
+
+