Skip to content

Commit 5f50991

Browse files
svenjacobssvenjacobs
authored
Merge branch 'main' into dependabot/gradle/kotlin-1.9.22
2 parents a0c8f20 + 3aa6c30 commit 5f50991

File tree

10 files changed

+38
-35
lines changed

10 files changed

+38
-35
lines changed

Diff for: ‎.github/workflows/verify-pr.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
java-version: 17
4141

4242
- name: Setup Gradle
43-
uses: gradle/gradle-build-action@v2
43+
uses: gradle/gradle-build-action@v3
4444

4545
- name: AVD cache
4646
uses: actions/cache@v4

Diff for: ‎demo-app/androidApp/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ android {
1717
compose = true
1818
}
1919
composeOptions {
20-
kotlinCompilerExtensionVersion = "1.5.3"
20+
kotlinCompilerExtensionVersion = "1.5.7"
2121
}
2222
packaging {
2323
resources {
@@ -40,12 +40,12 @@ android {
4040

4141
dependencies {
4242
implementation(project(":shared"))
43-
implementation(platform("androidx.compose:compose-bom:2023.09.02"))
43+
implementation(platform("androidx.compose:compose-bom:2023.10.01"))
4444
implementation("androidx.compose.ui:ui")
4545
implementation("androidx.compose.ui:ui-tooling")
4646
implementation("androidx.compose.ui:ui-tooling-preview")
4747
implementation("androidx.compose.foundation:foundation")
4848
implementation("androidx.compose.material3:material3")
49-
implementation("androidx.activity:activity-compose:1.7.2")
49+
implementation("androidx.activity:activity-compose:1.8.2")
5050
implementation("androidx.core:core-ktx:1.12.0")
5151
}

Diff for: ‎demo-app/build.gradle.kts

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
22

33
plugins {
4-
id("com.android.application").version("8.1.2").apply(false)
5-
id("com.android.library").version("8.1.2").apply(false)
6-
kotlin("android").version("1.9.10").apply(false)
7-
kotlin("multiplatform").version("1.9.10").apply(false)
8-
id("org.jetbrains.compose").version("1.5.2").apply(false)
9-
id("com.github.ben-manes.versions").version("0.48.0")
4+
id("com.android.application").version("8.2.1").apply(false)
5+
id("com.android.library").version("8.2.1").apply(false)
6+
kotlin("android").version("1.9.21").apply(false)
7+
kotlin("multiplatform").version("1.9.21").apply(false)
8+
id("org.jetbrains.compose").version("1.5.11").apply(false)
9+
id("com.github.ben-manes.versions").version("0.50.0")
1010
}
1111

1212
tasks.register("clean", Delete::class) {

Diff for: ‎demo-app/gradle/wrapper/gradle-wrapper.jar

2.06 KB
Binary file not shown.

Diff for: ‎demo-app/gradle/wrapper/gradle-wrapper.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
5+
validateDistributionUrl=true
56
zipStoreBase=GRADLE_USER_HOME
67
zipStorePath=wrapper/dists

Diff for: ‎demo-app/gradlew

+10-5
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@ done
8383
# This is normally unused
8484
# shellcheck disable=SC2034
8585
APP_BASE_NAME=${0##*/}
86-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
86+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87+
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
9088

9189
# Use the maximum available, or set MAX_FD != -1 to use that value.
9290
MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
133131
fi
134132
else
135133
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
134+
if ! command -v java >/dev/null 2>&1
135+
then
136+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137137
138138
Please set the JAVA_HOME variable in your environment to match the
139139
location of your Java installation."
140+
fi
140141
fi
141142

142143
# Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
197198
done
198199
fi
199200

201+
202+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204+
200205
# Collect all arguments for the java command;
201206
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
202207
# shell script including quotes and variable substitutions, so put them in

Diff for: ‎demo-app/shared/build.gradle.kts

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
2-
31
plugins {
42
kotlin("multiplatform")
53
id("com.android.library")
64
id("org.jetbrains.compose")
75
}
86

9-
@OptIn(ExperimentalKotlinGradlePluginApi::class)
107
kotlin {
118
jvmToolchain(17)
129

13-
targetHierarchy.default()
10+
applyDefaultHierarchyTemplate()
1411

1512
jvm("desktop")
1613

@@ -35,7 +32,7 @@ kotlin {
3532
sourceSets {
3633
val commonMain by getting {
3734
dependencies {
38-
val revealVersion = "3.0.0"
35+
val revealVersion = "3.0.2"
3936

4037
implementation(compose.runtime)
4138
implementation(compose.foundation)

Diff for: ‎gradle/libs.versions.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[versions]
2-
android-gradle-plugin = "8.1.2"
3-
androidx-activity = "1.8.0"
2+
android-gradle-plugin = "8.2.1"
3+
androidx-activity = "1.8.2"
44
androidx-compose-bom = "2023.10.01" # https://developer.android.com/jetpack/compose/bom/bom-mapping
55
androidx-compose-compiler = "1.5.9" # https://developer.android.com/jetpack/androidx/releases/compose-kotlin#pre-release_kotlin_compatibility
6-
jetbrains-compose = "1.5.11"
6+
jetbrains-compose = "1.5.12"
77
kotlin = "1.9.22"
88

99
[libraries]
@@ -18,7 +18,7 @@ androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
1818
androidx-compose-ui = { module = "androidx.compose.ui:ui" }
1919
androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
2020
androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
21-
slack-compose-lint-checks = "com.slack.lint.compose:compose-lint-checks:1.2.0"
21+
slack-compose-lint-checks = "com.slack.lint.compose:compose-lint-checks:1.3.1"
2222

2323
# Test dependencies
2424
androidx-compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
@@ -33,6 +33,6 @@ android-library = { id = "com.android.library", version.ref = "android-gradle-pl
3333
jetbrains-kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
3434
jetbrains-kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
3535
jetbrains-compose = { id = "org.jetbrains.compose", version.ref = "jetbrains-compose" }
36-
ben-manes-versions = "com.github.ben-manes.versions:0.50.0"
36+
ben-manes-versions = "com.github.ben-manes.versions:0.51.0"
3737
nexus-publish = "io.github.gradle-nexus.publish-plugin:1.3.0"
38-
kotlinter = "org.jmailen.kotlinter:4.1.1"
38+
kotlinter = "org.jmailen.kotlinter:4.2.0"

Diff for: ‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

Diff for: ‎gradlew

+7-7
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
145145
case $MAX_FD in #(
146146
max*)
147147
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
148-
# shellcheck disable=SC3045
148+
# shellcheck disable=SC2039,SC3045
149149
MAX_FD=$( ulimit -H -n ) ||
150150
warn "Could not query maximum file descriptor limit"
151151
esac
152152
case $MAX_FD in #(
153153
'' | soft) :;; #(
154154
*)
155155
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
156-
# shellcheck disable=SC3045
156+
# shellcheck disable=SC2039,SC3045
157157
ulimit -n "$MAX_FD" ||
158158
warn "Could not set maximum file descriptor limit to $MAX_FD"
159159
esac
@@ -202,11 +202,11 @@ fi
202202
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
203203
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204204

205-
# Collect all arguments for the java command;
206-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
207-
# shell script including quotes and variable substitutions, so put them in
208-
# double quotes to make sure that they get re-expanded; and
209-
# * put everything else in single quotes, so that it's not re-expanded.
205+
# Collect all arguments for the java command:
206+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207+
# and any embedded shellness will be escaped.
208+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209+
# treated as '${Hostname}' itself on the command line.
210210

211211
set -- \
212212
"-Dorg.gradle.appname=$APP_BASE_NAME" \

0 commit comments

Comments
 (0)