Merge branch 'release/3.4.1'

Author: mvojtkovszky

.gitignore

@@ -1,12 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea
 .DS_Store
 /build
 /captures

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.4.1 (2024-11-05)
+* bump Kotlin to 2.0.20, Gradle plugin to 8.7.2
+* bump core-ktx to 1.15.0, appcompat to 1.7.0, material to 1.12.0
+
 ## 3.4.0 (2023-10-27)
 * Calling `navigateBack` will take stack into consideration instead of calling default back press.
 * Calling `dismissOpenBottomSheet` or `dismissOpenDialog` will now return `Boolean` indicating whether open sheet or dialog was dismissed or not.

app/build.gradle

@@ -46,14 +46,14 @@ android {
 dependencies {
     implementation project(':singleactivitynavigation')
 
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.core:core-ktx:1.15.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'com.google.android.material:material:1.12.0'
 
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.10'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
     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'
 }

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
-        kotlin_version = "1.9.10" /* https://github.com/JetBrains/kotlin */
-        dokka_version = '1.9.10' /* https://github.com/Kotlin/dokka/releases */
+        kotlin_version = "2.0.20" /* https://github.com/JetBrains/kotlin */
+        dokka_version = '1.9.20' /* https://github.com/Kotlin/dokka/releases */
     }
 
     repositories {
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.7.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }
@@ -24,5 +24,5 @@ allprojects {
 }
 
 tasks.register('clean', Delete) {
-    delete rootProject.buildDir
+    delete rootProject.layout.buildDirectory
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Aug 29 10:21:25 CEST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

singleactivitynavigation/build.gradle

@@ -41,13 +41,13 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.core:core-ktx:1.12.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'androidx.core:core-ktx:1.15.0' /* https://developer.android.com/jetpack/androidx/releases/core */
+    implementation 'androidx.appcompat:appcompat:1.7.0' /* https://developer.android.com/jetpack/androidx/releases/appcompat */
+    implementation 'com.google.android.material:material:1.12.0' /* https://github.com/material-components/material-components-android/releases */
 
     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'
 }
 
 apply from: "$rootDir/gradle-mvn-push.gradle"

singleactivitynavigation/gradle.properties

@@ -3,4 +3,4 @@ buildTypes=debug,release
 groupId=com.github.mvojtkovszky
 artifactId=SingleActivityNavigation
 moduleId=singleactivitynavigation
-versionName=3.4.0
+versionName=3.4.1

singleactivitynavigation/src/main/kotlin/com/vojtkovszky/singleactivitynavigation/BaseSingleFragment.kt

@@ -206,7 +206,7 @@ abstract class BaseSingleFragment: Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        fragmentType = FragmentType.values().firstOrNull {
+        fragmentType = FragmentType.entries.firstOrNull {
             it.name == arguments?.getString(ARG_FRAGMENT_TYPE_NAME) } ?: FragmentType.INVALID
         translationZ = arguments?.getFloat(ARG_TRANSLATION_Z) ?: 0f