Merge branch 'release/2.0.4'

.github/workflows/deploy-store.yml

@@ -16,7 +16,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |
@@ -52,7 +52,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |

.github/workflows/deploy-test.yml

@@ -22,7 +22,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
       - uses: actions/cache@v3
         with:
           path: |

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
         - uses: actions/setup-java@v2
           with:
             distribution: 'zulu'
-            java-version: 11
+            java-version: 17
         - uses: actions/cache@v3
           with:
             path: |
@@ -48,7 +48,7 @@ jobs:
         - uses: actions/setup-java@v2
           with:
             distribution: 'zulu'
-            java-version: 11
+            java-version: 17
         - uses: actions/cache@v3
           with:
             path: |
@@ -74,7 +74,7 @@ jobs:
         - uses: actions/setup-java@v2
           with:
             distribution: 'zulu'
-            java-version: 11
+            java-version: 17
         - uses: actions/cache@v3
           with:
             path: |

app/build.gradle

@@ -23,8 +23,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 125
+        versionCode 126
-        versionName "2.0.3"
+        versionName "2.0.4"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -157,12 +157,16 @@ kapt {
     correctErrorTypes true
 }
 
+kotlin {
+    jvmToolchain(11)
+}
+
 play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = com.github.triplet.gradle.androidpublisher.ReleaseStatus.IN_PROGRESS
     userFraction = 0.50d
-    updatePriority = 3
+    updatePriority = 1
     enabled.set(false)
 }
 
@@ -171,7 +175,13 @@ huaweiPublish {
         hmsRelease {
             credentialsPath = "$rootDir/app/src/release/agconnect-credentials.json"
             buildFormat = "aab"
-            deployType = "draft"
+            deployType = "publish"
+            releaseNotes = [
+                new ru.cian.huawei.publish.ReleaseNote(
+                    "pl-PL",
+                    "$projectDir/src/main/play/release-notes/pl-PL/default.txt"
+                )
+            ]
         }
     }
 }
@@ -182,18 +192,18 @@ ext {
     room = "2.5.1"
     chucker = "3.5.2"
     mockk = "1.13.5"
-    coroutines = "1.7.0"
+    coroutines = "1.7.1"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.0.3'
+    implementation 'io.github.wulkanowy:sdk:2.0.4'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines"
 
-    implementation "androidx.core:core-ktx:1.10.0"
+    implementation "androidx.core:core-ktx:1.10.1"
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.7.1"
     implementation "androidx.appcompat:appcompat:1.6.1"
@@ -251,7 +261,7 @@ dependencies {
     playImplementation 'com.google.android.play:core-ktx:1.8.1'
     playImplementation 'com.google.android.gms:play-services-ads:22.0.0'
 
-    hmsImplementation 'com.huawei.hms:hianalytics:6.9.1.200'
+    hmsImplementation 'com.huawei.hms:hianalytics:6.10.0.300'
     hmsImplementation 'com.huawei.agconnect:agconnect-crash:1.9.0.300'
 
     releaseImplementation "com.github.ChuckerTeam.Chucker:library-no-op:$chucker"
@@ -265,7 +275,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.10.2'
+    testImplementation 'org.robolectric:robolectric:4.10.3'
     testImplementation "androidx.test:runner:1.5.2"
     testImplementation "androidx.test.ext:junit:1.1.5"
     testImplementation "androidx.test:core:1.5.0"

app/src/main/play/release-notes/pl-PL/default.txt

@@ -1,4 +1,4 @@
-Wersja 2.0.3
+Wersja 2.0.4
 
 — zaktualizowaliśmy wygląd aplikacji na (częściowo) zgodny z wytycznymi Material 3
 — dodaliśmy możliwość zmiany kolejności pozycji w menu dolnym

app/src/main/res/layout/item_homework_dialog_details.xml

@@ -14,16 +14,13 @@
 
         <TextView
             android:id="@+id/homework_dialog_header"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
+            android:layout_weight="1"
             android:text="@string/all_details"
             android:textAppearance="?attr/textAppearanceHeadlineSmall"
-            android:textColor="?attr/colorOnSurface"
+            android:textColor="?attr/colorOnSurface" />
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
 
         <ImageButton
             android:id="@+id/homework_dialog_delete"

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext {
         kotlin_version = '1.8.21'
         about_libraries = '10.6.3'
-        hilt_version = "2.45"
+        hilt_version = "2.46.1"
     }
     repositories {
         mavenCentral()
@@ -13,13 +13,13 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.3.15'
         classpath 'com.huawei.agconnect:agcp:1.9.0.300'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
         classpath "com.github.triplet.gradle:play-publisher:3.6.0"
-        classpath "ru.cian:huawei-publish-gradle-plugin:1.3.5"
+        classpath "ru.cian:huawei-publish-gradle-plugin:1.4.0"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:4.0.0.2929"
         classpath "gradle.plugin.com.star-zero.gradle:githook:1.2.0"
         classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:$about_libraries"

gradle.properties

@@ -11,12 +11,17 @@ org.gradle.jvmargs=-Xmx1536m
 #
 android.enableJetifier=true
 android.useAndroidX=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 #
 kotlin.code.style=official
-#
 kapt.use.worker.api=true
 kapt.include.compile.classpath=false
 #
+# https://developer.huawei.com/consumer/en/doc/development/AppGallery-connect-Guides/agc-common-faq-0000001063210244#section17273113244910
+apmsInstrumentationEnabled=false
+#
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -85,9 +85,6 @@ done
 APP_BASE_NAME=${0##*/}
 APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
@@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

settings.gradle

@@ -1 +1,4 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}
 include ':app'