Skip to content

Commit

Permalink
Updated Kotlin to 2.1.0 and other deps
Browse files Browse the repository at this point in the history
  • Loading branch information
arkivanov committed Jan 11, 2025
1 parent 8ab0149 commit f23a901
Show file tree
Hide file tree
Showing 10 changed files with 251 additions and 481 deletions.
22 changes: 11 additions & 11 deletions deps.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ mvikotlin = "4.2.0"
timeTravelPlugin = "3.0.1"
timeTravelApp = "3.0.1"

kotlin = "2.0.10"
kotlin = "2.1.0"
kotlinxBinaryCompatibilityValidator = "0.16.3"
kotlinxCoroutines = "1.8.1"
intellijGradlePlugin = "1.15.0"
kotlinxCoroutines = "1.9.0"
intellijGradlePlugin = "1.17.4"
detektGradlePlugin = "1.23.6"
essenty = "2.1.0"
reaktive = "2.2.0"
essenty = "2.4.0"
reaktive = "2.3.0"
multiplatformSettings = "1.1.0"
compose = "1.6.10"
kotlinWrappers = "1.0.0-pre.608"
androidGradle = "8.2.0"
androidGradle = "8.7.3"
androidxLifecycle = "2.2.0"
androidxCore = "1.1.0"
androidxAppcompat = "1.1.0"
Expand Down Expand Up @@ -54,9 +54,9 @@ russhwolf-multiplatformSettings = { group = "com.russhwolf", name = "multiplatfo
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" }
android-gradle = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradle" }

androidx-core-coreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
androidx-appcompat-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompat" }
androidx-recyclerview-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerView" }
androidx-constraintlayout-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintLayout" }
androidx-core-coreKtx = { group = "androidx.core", name = "core-ktx", version.ref = "androidxCore" }
androidx-appcompat-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppcompat" }
androidx-recyclerview-recyclerview = { group = "androidx.recyclerview", name = "recyclerview", version.ref = "androidxRecyclerView" }
androidx-constraintlayout-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidxConstraintLayout" }
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,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
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 @@ -85,9 +85,6 @@ done
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"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum

Expand Down Expand Up @@ -133,10 +130,13 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
Expand Down Expand Up @@ -197,6 +197,10 @@ if "$cygwin" || "$msys" ; then
done
fi


# 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"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
Expand Down
Loading

0 comments on commit f23a901

Please sign in to comment.