Skip to content

Commit

Permalink
Merge pull request #924 from mikepenz/feature/upgrade_dependencies_20…
Browse files Browse the repository at this point in the history
…230922

Dependency Upgrades | Compose 1.5.1 | Kotlin 1.9.10
  • Loading branch information
mikepenz authored Sep 22, 2023
2 parents 43d7ac0 + 02b5633 commit 8af6f72
Show file tree
Hide file tree
Showing 8 changed files with 308 additions and 265 deletions.
519 changes: 276 additions & 243 deletions app-desktop/src/main/resources/aboutlibraries.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,35 @@ targetSdk = "34"
gradleBuild = "8.1.1"
buildTools = "34.0.0"
# kotlin
dokka = "1.8.20"
kotlinCore = { require = "1.9.0" }
dokka = "1.9.0"
kotlinCore = { require = "1.9.10" }
kotlinCoroutines = { require = "1.7.3" }
kotlinxSerialization = "1.5.1"
kotlinxSerialization = "1.6.0"
kotlinxCollections = "0.3.5"
# compose
compose = "1.5.0"
composeUi = "1.5.0" # foundation / material
composeCompiler = "1.5.2"
composejb = "1.5.0" # "1.4.0-dev-wasm09" # "1.5.0-dev1114"
compose = "1.5.1"
composeUi = "1.5.1" # foundation / material
composeCompiler = "1.5.3"
composejb = "1.5.1" # "1.4.0-dev-wasm09"
composeCompilerJb = "1.5.0"
# androidx
activity = "1.7.2"
cardview = "1.0.0"
constraintLayout = "2.1.4"
core = "1.10.1"
lifecycle = { require = "2.6.1" }
navigation = "2.7.1"
core = "1.12.0"
lifecycle = { require = "2.6.2" }
navigation = "2.7.3"
recyclerView = "1.3.1"
# google
material = "1.9.0"
# other
accompanist = "0.30.1"
accompanist = "0.32.0"
fastAdapter = "5.7.0"
gradleMvnPublish = "0.25.3"
iconics = "5.4.0"
itemAnimators = "1.1.0"
ivy = "2.5.1"
materialDrawer = "9.0.1"
materialDrawer = "9.0.2"
okhttp = "4.11.0"

[libraries]
Expand Down
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.3-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
Binary file modified plugin-build/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion plugin-build/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.3-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
12 changes: 8 additions & 4 deletions plugin-build/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

0 comments on commit 8af6f72

Please sign in to comment.