Merge remote-tracking branch 'origin/main' into main

# Conflicts: # versions.properties
sunhonglin · Sep 24, 2024 · 0fafccc · 0fafccc
2 parents f7b5384 + 38bf65f
commit 0fafccc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,7 +24,8 @@ subprojects {
         maven(url = Repositories.REPO_MAVEN_LANGCOO)
     }
 
-    buildDir = File(rootProject.buildDir, name)
+    val dirNameLast = path.substringBeforeLast(":").replace(":","\\")
+    buildDir = File("${rootProject.buildDir}$dirNameLast", name)
     group = property("app.group").toString()
 }
 

diff --git a/versions.properties b/versions.properties
@@ -90,7 +90,7 @@ version.androidx.room=2.5.1
 ##        # available=2.6.0
 ##        # available=2.6.1
 
-version.com.sunhonglin..base-ktx=1.3.2
+version.com.sunhonglin..base-ktx=1.3.6
 
 version.com.sunhonglin..core-ktx=1.1.0