Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
InsanusMokrassar committed Sep 5, 2024
1 parent adf8eb7 commit be13d78
Show file tree
Hide file tree
Showing 20 changed files with 610 additions and 701 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.idea
.kotlin
out/*
*.iml
target
Expand Down
3 changes: 2 additions & 1 deletion .templates/mvvm/{{.module_path.lowercase()}}/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
alias(libs.plugins.compose)
alias(libs.plugins.kt.jb.compose)
}

apply from: "$mppProjectWithSerializationPresetPath"
apply from: "$mppProjectWithSerialization"

kotlin {
sourceSets {
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

## 0.5.3

* `Versions`:
* `Kotlin`: `1.9.23` -> `2.0.20`
* `Serialization`: `1.6.3` -> `1.7.2`
* `KSLog`: `1.3.4` -> `1.3.6`
* `Compose`: `1.6.2` -> `1.7.0-alpha03`
* `MicroUtils`: `0.21.0` -> `0.22.2`
* `Android Compile SDK`: `34` -> `35`

## 0.5.2

* Add support for native targets
Expand Down
5 changes: 3 additions & 2 deletions compose/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ plugins {
id "org.jetbrains.kotlin.plugin.serialization"
id "com.android.library"
alias(libs.plugins.compose)
alias(libs.plugins.kt.jb.compose)
}

apply from: "$mppProjectWithSerializationPresetPath"
apply from: "$publishGradlePath"
apply from: "$mppProjectWithSerialization"
apply from: "$mpp_publish"

kotlin {
sourceSets {
Expand Down
4 changes: 2 additions & 2 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ plugins {
id "org.jetbrains.dokka"
}

apply from: "$mppProjectWithSerializationPresetPath"
apply from: "$publishGradlePath"
apply from: "$mppProjectWithSerialization"
apply from: "$mpp_publish"

kotlin {
sourceSets {
Expand Down
4 changes: 2 additions & 2 deletions core/src/commonTest/kotlin/WalkingTests.kt
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ class WalkingTests : NavigationTest() {

c0.walk {
it.onNode { visitingNode ->
assertEquals(orderOfVisiting.removeFirst().nodeOrThrow, visitingNode)
assertEquals(orderOfVisiting.removeAt(0).nodeOrThrow, visitingNode)
}.onChain { visitingChain ->
assertEquals(orderOfVisiting.removeFirst().chainOrThrow, visitingChain)
assertEquals(orderOfVisiting.removeAt(0).chainOrThrow, visitingChain)
}
}

Expand Down
33 changes: 13 additions & 20 deletions extensions.gradle
Original file line number Diff line number Diff line change
@@ -1,26 +1,19 @@
allprojects {
ext {
projectByName = { String name ->
for (subproject in rootProject.subprojects) {
if (subproject.name == name) {
return subproject
}
}
return null
}
File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates")

internalProject = { String name ->
projectByName(name)
}
Map properties = new HashMap<String, String>()

mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
mppSampleProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppSampleProjectWithSerialization.gradle"
mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle"
mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
if (templatesFolder.exists() && templatesFolder.isDirectory()) {
templatesFolder.listFiles().each {
properties[it.name - ".gradle"] = it.absolutePath
}
}

defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
allprojects {
ext {
releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"

publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
properties.forEach { k, v ->
it[k] = v
}
}
}
19 changes: 10 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
[versions]

kotlin = "1.9.23"
kotlin = "2.0.20"
kotlin-coroutines = "1.8.1"
kotlin-serialization = "1.6.3"
kotlin-serialization = "1.7.2"
dokka = "1.9.20"

microutils = "0.21.4"
kslog = "1.3.4"
microutils = "0.22.2"
kslog = "1.3.6"
uuid = "0.8.4"

koin = "3.5.6"
compose = "1.6.2"
compose = "1.7.0-alpha03"

dexcount = "4.0.0"
junit_version = "4.12"
Expand All @@ -19,15 +19,15 @@ espresso_core = "3.6.1"

android-gradle-plugin = "8.1.4"
android-minSdk = "21"
android-compileSdk = "34"
android-buildTools = "34.0.0"
android-compileSdk = "35"
android-buildTools = "35.0.0"
android-multidex = "2.0.1"

android-core-ktx = "1.13.1"
android-appcompat = "1.7.0"
android-material = "1.12.0"
android-compose-activity = "1.9.0"
android-compose-material3 = "1.2.1"
android-compose-activity = "1.9.2"
android-compose-material3 = "1.3.0"

github-release = "2.5.2"

Expand Down Expand Up @@ -82,5 +82,6 @@ kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
compose = { id = "org.jetbrains.compose", version.ref = "compose" }
kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project.version = "$version"
project.group = "$group"

// apply from: "$publishGradlePath"
// apply from: "$mpp_publish"

kotlin {
jvm {
Expand Down Expand Up @@ -43,7 +43,6 @@ kotlin {
jsTest {
dependencies {
implementation libs.kotlin.test.js
implementation libs.kotlin.test.junit
}
}
androidUnitTest {
Expand All @@ -61,4 +60,4 @@ java {
targetCompatibility = JavaVersion.VERSION_17
}

apply from: "$defaultAndroidSettingsPresetPath"
apply from: "$defaultAndroidSettings"
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project.version = "$version"
project.group = "$group"

// apply from: "$publishGradlePath"
// apply from: "$mpp_publish"

kotlin {
jvm {
Expand Down Expand Up @@ -40,7 +40,6 @@ kotlin {
jsTest {
dependencies {
implementation libs.kotlin.test.js
implementation libs.kotlin.test.junit
}
}
androidUnitTest {
Expand All @@ -58,4 +57,4 @@ java {
targetCompatibility = JavaVersion.VERSION_17
}

apply from: "$defaultAndroidSettingsPresetPath"
apply from: "$defaultAndroidSettings"
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit be13d78

Please sign in to comment.