Merge branch 'release/3.4.2'

mvojtkovszky · mvojtkovszky · commit 31542e7fb323 · 2024-11-05T11:40:58.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # CHANGELOG
 
-## 3.4.1 (2024-11-05)
+## 3.4.2 (2024-11-05)
+* bump buildToolsVersion 35.0.0, targetSdkVersion, compileSdkVersion to 35
 * 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
 
diff --git a/gradle-mvn-push.gradle b/gradle-mvn-push.gradle
@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'
 tasks.register('javadocJar', Jar) {
     dependsOn dokkaJavadoc
     archiveClassifier.set('javadoc')
-    from "$buildDir/dokka/javadoc"
+    from "${rootProject.layout.buildDirectory}/dokka/javadoc"
 }
 
 afterEvaluate {
diff --git a/gradle.properties b/gradle.properties
@@ -21,8 +21,8 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # base versions
-buildToolsVersion=34.0.0
-compileSdkVersion=34
+buildToolsVersion=35.0.0
+compileSdkVersion=35
 minSdkVersion=21
-targetSdkVersion=34
+targetSdkVersion=35
 javaVersion=17
diff --git a/singleactivitynavigation/gradle.properties b/singleactivitynavigation/gradle.properties
@@ -3,4 +3,4 @@ buildTypes=debug,release
 groupId=com.github.mvojtkovszky
 artifactId=SingleActivityNavigation
 moduleId=singleactivitynavigation
-versionName=3.4.1
+versionName=3.4.2

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ apply plugin: 'maven-publish'`
`3`	`3`	`tasks.register('javadocJar', Jar) {`
`4`	`4`	`dependsOn dokkaJavadoc`
`5`	`5`	`archiveClassifier.set('javadoc')`
`6`		`- from "$buildDir/dokka/javadoc"`
	`6`	`+ from "${rootProject.layout.buildDirectory}/dokka/javadoc"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`afterEvaluate {`