diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index cbfa9ef..8dde996 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,7 +15,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'gradle' - name: Run tests diff --git a/.github/workflows/sign.yml b/.github/workflows/sign.yml index dd9ddf1..8f08edb 100644 --- a/.github/workflows/sign.yml +++ b/.github/workflows/sign.yml @@ -18,7 +18,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: 'temurin' - java-version: '11' + java-version: '17' cache: 'gradle' - name: Sign APK diff --git a/app/build.gradle b/app/build.gradle index 2674886..1271b99 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,7 +72,7 @@ android { dependencies { // https://github.com/material-components/material-components-android - implementation "com.google.android.material:material:1.4.0" + implementation "com.google.android.material:material:1.5.0" implementation "androidx.navigation:navigation-fragment-ktx:$nav_version" implementation "androidx.navigation:navigation-runtime-ktx:$nav_version" @@ -82,16 +82,16 @@ dependencies { implementation "androidx.core:core-ktx:1.7.0" // https://developer.android.com/jetpack/androidx/releases/appcompat - implementation "androidx.appcompat:appcompat:1.4.0" + implementation "androidx.appcompat:appcompat:1.4.1" // https://developer.android.com/jetpack/androidx/releases/constraintlayout - implementation "androidx.constraintlayout:constraintlayout:2.1.2" + implementation "androidx.constraintlayout:constraintlayout:2.1.3" // https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" // https://developer.android.com/jetpack/androidx/releases/lifecycle - def lifecycle_version = "2.4.0" + def lifecycle_version = "2.4.1" implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version" implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version" @@ -116,18 +116,18 @@ dependencies { implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2" // https://developer.android.com/jetpack/androidx/releases/preference - implementation "androidx.preference:preference-ktx:1.1.1" + implementation "androidx.preference:preference-ktx:1.2.0" // https://github.com/JakeWharton/timber/releases implementation 'com.jakewharton.timber:timber:5.0.1' // https://developer.android.com/jetpack/androidx/releases/paging - def paging_version = "3.1.0" + def paging_version = "3.1.1" implementation "androidx.paging:paging-runtime-ktx:$paging_version" testImplementation "androidx.paging:paging-common-ktx:$paging_version" // https://developer.android.com/jetpack/androidx/releases/room - def room_version = "2.4.0" + def room_version = "2.4.2" implementation "androidx.room:room-runtime:$room_version" implementation "androidx.room:room-ktx:$room_version" implementation "androidx.room:room-paging:$room_version" @@ -156,10 +156,10 @@ dependencies { testImplementation "com.google.truth:truth:1.1.3" // https://github.com/androidbroadcast/ViewBindingPropertyDelegate/releases - implementation "com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.3" + implementation "com.github.kirich1409:viewbindingpropertydelegate-noreflection:1.5.6" // https://github.com/facebook/flipper/releases - def flipper_version = "0.127.0" + def flipper_version = "0.140.0" debugImplementation "com.facebook.flipper:flipper:$flipper_version" debugImplementation "com.facebook.flipper:flipper-leakcanary2-plugin:$flipper_version" debugImplementation "com.facebook.flipper:flipper-network-plugin:$flipper_version" @@ -168,6 +168,6 @@ dependencies { debugImplementation "com.facebook.soloader:soloader:0.10.3" // https://github.com/square/leakcanary/releases - debugImplementation "com.squareup.leakcanary:leakcanary-android:2.7" + debugImplementation "com.squareup.leakcanary:leakcanary-android:2.8.1" } \ No newline at end of file diff --git a/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt index 4313bb5..67ac3f4 100644 --- a/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt +++ b/app/src/main/java/gq/kirmanak/mealient/data/recipes/db/RecipeDao.kt @@ -65,6 +65,7 @@ interface RecipeDao { suspend fun insertRecipeIngredients(ingredients: List) @Transaction + @SuppressWarnings(RoomWarnings.CURSOR_MISMATCH) // The lint is wrong, the columns are actually used @Query("SELECT * FROM recipe JOIN recipe_summaries ON recipe.remote_id = recipe_summaries.remote_id JOIN recipe_ingredient ON recipe_ingredient.recipe_id = recipe.remote_id JOIN recipe_instruction ON recipe_instruction.recipe_id = recipe.remote_id WHERE recipe.remote_id = :recipeId") suspend fun queryFullRecipeInfo(recipeId: Long): FullRecipeInfo? diff --git a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt index d7fa772..ecb1696 100644 --- a/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt +++ b/app/src/main/java/gq/kirmanak/mealient/ui/recipes/RecipesFragment.kt @@ -40,7 +40,7 @@ class RecipesFragment : Fragment(R.layout.fragment_recipes) { super.onViewCreated(view, savedInstanceState) Timber.v("onViewCreated() called with: view = $view, savedInstanceState = $savedInstanceState") setupRecipeAdapter() - authStatuses.observe(this, authStatusObserver) + authStatuses.observe(viewLifecycleOwner, authStatusObserver) (requireActivity() as? AppCompatActivity)?.supportActionBar?.title = null } diff --git a/build.gradle b/build.gradle index 9f85884..5eab59b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,13 @@ buildscript { ext { // https://developer.android.com/jetpack/androidx/releases/navigation - nav_version = "2.4.0-rc01" + nav_version = "2.4.1" // https://dagger.dev/hilt/gradle-setup - hilt_version = "2.40.5" + hilt_version = "2.41" // https://kotlinlang.org/docs/gradle.html - kotlin_version = "1.6.0" + kotlin_version = "1.6.10" } repositories { @@ -17,7 +17,7 @@ buildscript { dependencies { // https://maven.google.com/web/index.html?q=com.android.tools.build#com.android.tools.build:gradle - classpath "com.android.tools.build:gradle:7.0.4" + classpath "com.android.tools.build:gradle:7.1.2" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7a14485..e96f1bd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Nov 06 22:23:55 MSK 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME