Skip to content

Commit

Permalink
Updated Kotlin to 2.0.0, Essenty to 2.1.0, Reaktive to 2.2.0, AGP to …
Browse files Browse the repository at this point in the history
…8.2.0
  • Loading branch information
arkivanov committed Jun 6, 2024
1 parent ec5b419 commit d7e8824
Show file tree
Hide file tree
Showing 16 changed files with 627 additions and 455 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@
local.properties
.idea
/build
.DS_Store
.DS_Store
.kotlin
8 changes: 1 addition & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ buildscript {
classpath(deps.android.gradle)
classpath(deps.intellij.gradleIntellijPlug)
classpath(deps.compose.composeGradlePlug)
classpath(deps.kotlin.composeCompilerGradlePlug)
classpath(deps.kotlinx.binaryCompatibilityValidator)
classpath(deps.detekt.gradleDetektPlug)
}
Expand Down Expand Up @@ -79,11 +80,4 @@ allprojects {
google()
maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
}

afterEvaluate {
// Workaround for https://youtrack.jetbrains.com/issue/KT-52776
rootProject.extensions.findByType<org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension>()?.apply {
versions.webpackCli.version = "4.10.0"
}
}
}
17 changes: 9 additions & 8 deletions deps.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ mvikotlin = "4.0.0"
timeTravelPlugin = "3.0.1"
timeTravelApp = "3.0.1"

kotlin = "1.9.23"
kotlinxBinaryCompatibilityValidator = "0.13.2"
kotlinxCoroutines = "1.8.0"
kotlin = "2.0.0"
kotlinxBinaryCompatibilityValidator = "0.15.0-Beta.2"
kotlinxCoroutines = "1.8.1"
intellijGradlePlugin = "1.15.0"
detektGradlePlugin = "1.23.3"
essenty = "2.0.0"
reaktive = "2.1.0"
detektGradlePlugin = "1.23.6"
essenty = "2.1.0"
reaktive = "2.2.0"
multiplatformSettings = "1.1.0"
compose = "1.6.1"
compose = "1.6.10"
kotlinWrappers = "1.0.0-pre.608"
androidGradle = "8.0.2"
androidGradle = "8.2.0"
androidxLifecycle = "2.2.0"
androidxCore = "1.1.0"
androidxAppcompat = "1.1.0"
Expand Down Expand Up @@ -52,6 +52,7 @@ reaktive-coroutinesInterop = { group = "com.badoo.reaktive", name = "coroutines-
russhwolf-multiplatformSettings = { group = "com.russhwolf", name = "multiplatform-settings", version.ref = "multiplatformSettings" }

compose-composeGradlePlug = { group = "org.jetbrains.compose", name = "compose-gradle-plugin", version.ref = "compose" }
kotlin-composeCompilerGradlePlug = { group = "org.jetbrains.kotlin", name = "compose-compiler-gradle-plugin", version.ref = "kotlin" }

android-gradle = { group = "com.android.tools.build", name = "gradle", version.ref ="androidGradle" }

Expand Down
3 changes: 0 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ android.enableJetifier=true
kotlin.mpp.androidSourceSetLayoutVersion=2
kotlin.mpp.applyDefaultHierarchyTemplate=false
kotlin.js.ir.output.granularity=whole-program

# For compatibility with Kotlin 1.9.0
android.experimental.lint.version=8.1.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down
1 change: 1 addition & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand Down
Loading

0 comments on commit d7e8824

Please sign in to comment.