Merge pull request #312 from InsanusMokrassar/0.20.7

0.20.7

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.20.7
+
+**THIS VERSION CONTAINS UPDATES OF DEPENDENCIES UP TO BETA VERSIONS. USE WITH CAUTION**
+
+* `Versions`:
+    * `Kotlin`: `1.9.10` -> `1.9.20-Beta2`
+    * `Compose`: `1.5.1` -> `1.5.10-beta02`
+    * `Exposed`: `0.43.0` -> `0.44.0`
+    * `Ktor`: `2.3.4` -> `2.3.5`
+    * `Koin`: `3.4.3` -> `3.5.0`
+    * `Okio`: `3.5.0` -> `3.6.0`
+    * `Android Core`: `1.10.1` -> `1.12.0`
+    * `Android Compose Material`: `1.1.1` -> `1.1.2`
+
 ## 0.20.6
 
 * `Repos`:

extensions.gradle

@@ -19,6 +19,12 @@ allprojects {
         }
 
         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
+//        String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"]
+//        String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get()
+//        composePluginKotlinVersion = compilerPluginVersionFromProperties
+//        if (compilerPluginVersionFromProperties == null) {
+//            composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions
+//        }
 
         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle"
         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle"

gradle.properties

@@ -6,7 +6,7 @@ kotlin.incremental.js=true
 #kotlin.experimental.tryK2=true
 android.useAndroidX=true
 android.enableJetifier=true
-org.gradle.jvmargs=-Xmx2g
+org.gradle.jvmargs=-Xmx2500m
 
 # JS NPM
 
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.20.6
+version=0.20.7
-android_code_version=212
+android_code_version=213

gradle/libs.versions.toml

@@ -1,41 +1,42 @@
 [versions]
 
-kt = "1.9.10"
+kt = "1.9.20-Beta2"
+#compose-kotlin = "1.5.10-beta02"
 kt-serialization = "1.6.0"
 kt-coroutines = "1.7.3"
 
 kslog = "1.2.1"
 
-jb-compose = "1.5.1"
+jb-compose = "1.5.10-beta02"
-jb-exposed = "0.43.0"
+jb-exposed = "0.44.0"
 jb-dokka = "1.9.0"
 
 korlibs = "4.0.10"
 uuid = "0.8.1"
 
-ktor = "2.3.4"
+ktor = "2.3.5"
 
 gh-release = "2.4.1"
 
-koin = "3.4.3"
+koin = "3.5.0"
 
-okio = "3.5.0"
+okio = "3.6.0"
 
-ksp = "1.9.10-1.0.13"
+ksp = "1.9.20-Beta2-1.0.13"
 kotlin-poet = "1.14.2"
 
-versions = "0.47.0"
+versions = "0.49.0"
 
 android-gradle = "7.4.2"
 dexcount = "4.0.0"
 
-android-coreKtx = "1.10.1"
+android-coreKtx = "1.12.0"
 android-recyclerView = "1.3.1"
 android-appCompat = "1.6.1"
 android-fragment = "1.6.1"
 android-espresso = "3.5.1"
 android-test = "1.1.5"
-android-compose-material3 = "1.1.1"
+android-compose-material3 = "1.1.2"
 
 android-props-minSdk = "21"
 android-props-compileSdk = "34"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

mppAndroidProject.gradle

@@ -4,7 +4,7 @@ project.group = "$group"
 apply from: "$publishGradlePath"
 
 kotlin {
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
 

mppProjectWithSerialization.gradle

@@ -15,7 +15,7 @@ kotlin {
         browser()
         nodejs()
     }
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
     linuxX64()

mppProjectWithSerializationAndCompose.gradle

@@ -15,7 +15,7 @@ kotlin {
         browser()
         nodejs()
     }
-    android {
+    androidTarget {
         publishAllLibraryVariants()
     }
 
@@ -73,3 +73,10 @@ java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8
 }
+
+
+//compose {
+//    if (composePluginKotlinVersion != null && !composePluginKotlinVersion.isEmpty()) {
+//        kotlinCompilerPlugin.set(composePluginKotlinVersion)
+//    }
+//}