Merge branch 'release/2.6.14'

app/build.gradle

@@ -27,8 +27,8 @@ android {
         testApplicationId "io.github.tests.wulkanowy"
         minSdkVersion 21
         targetSdkVersion 34
-        versionCode 173
+        versionCode 174
-        versionName "2.6.13"
+        versionName "2.6.14"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         resValue "string", "app_name", "Wulkanowy"
@@ -160,8 +160,8 @@ play {
     defaultToAppBundles = false
     track = 'production'
     releaseStatus = ReleaseStatus.IN_PROGRESS
-    userFraction = 0.1d
+    userFraction = 0.99d
-    updatePriority = 2
+    updatePriority = 3
     enabled.set(false)
 }
 
@@ -186,12 +186,12 @@ ext {
     android_hilt = "1.2.0"
     room = "2.6.1"
     chucker = "4.0.0"
-    mockk = "1.13.10"
+    mockk = "1.13.11"
     coroutines = "1.8.1"
 }
 
 dependencies {
-    implementation 'io.github.wulkanowy:sdk:2.6.11'
+    implementation 'io.github.wulkanowy:sdk:2.6.12'
 
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
@@ -203,13 +203,13 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
     implementation "androidx.activity:activity-ktx:1.9.0"
     implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "androidx.fragment:fragment-ktx:1.7.0"
+    implementation "androidx.fragment:fragment-ktx:1.7.1"
-    implementation "androidx.annotation:annotation:1.7.1"
+    implementation "androidx.annotation:annotation:1.8.0"
     implementation "androidx.javascriptengine:javascriptengine:1.0.0-beta01"
 
     implementation "androidx.preference:preference-ktx:1.2.1"
     implementation "androidx.recyclerview:recyclerview:1.3.2"
-    implementation "androidx.viewpager2:viewpager2:1.1.0-rc01"
+    implementation "androidx.viewpager2:viewpager2:1.1.0"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
@@ -221,7 +221,7 @@ dependencies {
     implementation "androidx.work:work-runtime:$work_manager"
     playImplementation "androidx.work:work-gcm:$work_manager"
 
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.7.0"
+    implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.8.0"
 
     implementation "androidx.room:room-runtime:$room"
     implementation "androidx.room:room-ktx:$room"
@@ -256,7 +256,7 @@ dependencies {
     playImplementation 'com.google.firebase:firebase-crashlytics:'
     playImplementation 'com.google.firebase:firebase-config'
 
-    playImplementation 'com.google.android.gms:play-services-ads:22.6.0'
+    playImplementation 'com.google.android.gms:play-services-ads:23.1.0'
     playImplementation "com.google.android.play:integrity:1.3.0"
     playImplementation 'com.google.android.play:app-update-ktx:2.1.0'
     playImplementation 'com.google.android.play:review-ktx:2.0.1'
@@ -276,7 +276,7 @@ dependencies {
     testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
 
-    testImplementation 'org.robolectric:robolectric:4.12.1'
+    testImplementation 'org.robolectric:robolectric:4.12.2'
     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/java/io/github/wulkanowy/data/api/services/WulkanowyService.kt

@@ -11,6 +11,6 @@ interface WulkanowyService {
     @GET("/v1.json")
     suspend fun getAdminMessages(): List<AdminMessage>
 
-    @GET("/mapping2.json")
+    @GET("/mapping3.json")
     suspend fun getMapping(): Mapping
 }

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

@@ -1,6 +1,5 @@
-Wersja 2.6.13
+Wersja 2.6.14
 
-— dodaliśmy tryb awaryjny (no w sensie taka przeglądarka z dziennikiem w apce, ale nie trzeba się ręcznie logować)
+— naprawiliśmy moduł "Uczeń", czyli bez wiadomości i "Uczeń Plus" (na razie)
-— naprawiliśmy ładowania ucznia na tle klasy i lekcji zrealizowanych
 
 Pełna lista zmian: https://github.com/wulkanowy/wulkanowy/releases

build.gradle

@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = '1.9.23'
+        kotlin_version = '1.9.24'
         about_libraries = '11.1.4'
         hilt_version = '2.51.1'
     }
@@ -13,12 +13,12 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.19"
+        classpath "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:$kotlin_version-1.0.20"
-        classpath 'com.android.tools.build:gradle:8.4.0'
+        classpath 'com.android.tools.build:gradle:8.4.1'
         classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version"
         classpath 'com.google.gms:google-services:4.4.1'
         classpath 'com.huawei.agconnect:agcp:1.9.1.303'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.9'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.1'
         classpath "com.github.triplet.gradle:play-publisher:3.8.4"
         classpath "ru.cian:huawei-publish-gradle-plugin:1.4.2"
         classpath "org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:5.0.0.4638"