diff --git a/demo-app/androidApp/build.gradle.kts b/demo-app/androidApp/build.gradle.kts index 1cbfcfc..364f6ea 100644 --- a/demo-app/androidApp/build.gradle.kts +++ b/demo-app/androidApp/build.gradle.kts @@ -17,7 +17,7 @@ android { compose = true } composeOptions { - kotlinCompilerExtensionVersion = "1.5.7" + kotlinCompilerExtensionVersion = "1.5.10" } packaging { resources { @@ -40,7 +40,7 @@ android { dependencies { implementation(project(":shared")) - implementation(platform("androidx.compose:compose-bom:2023.10.01")) + implementation(platform("androidx.compose:compose-bom:2024.02.01")) implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui-tooling") implementation("androidx.compose.ui:ui-tooling-preview") diff --git a/demo-app/build.gradle.kts b/demo-app/build.gradle.kts index 14bcf7e..55a1031 100644 --- a/demo-app/build.gradle.kts +++ b/demo-app/build.gradle.kts @@ -1,12 +1,12 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask plugins { - id("com.android.application").version("8.2.1").apply(false) - id("com.android.library").version("8.2.1").apply(false) - kotlin("android").version("1.9.21").apply(false) - kotlin("multiplatform").version("1.9.21").apply(false) - id("org.jetbrains.compose").version("1.5.11").apply(false) - id("com.github.ben-manes.versions").version("0.50.0") + id("com.android.application").version("8.3.0").apply(false) + id("com.android.library").version("8.3.0").apply(false) + kotlin("android").version("1.9.22").apply(false) + kotlin("multiplatform").version("1.9.22").apply(false) + id("org.jetbrains.compose").version("1.6.0").apply(false) + id("com.github.ben-manes.versions").version("0.51.0") } tasks.register("clean", Delete::class) { diff --git a/demo-app/desktopApp/src/jvmTest/kotlin/.gitcreate b/demo-app/desktopApp/src/jvmTest/kotlin/.gitcreate new file mode 100644 index 0000000..e69de29 diff --git a/demo-app/gradle/wrapper/gradle-wrapper.jar b/demo-app/gradle/wrapper/gradle-wrapper.jar index 7f93135..d64cd49 100644 Binary files a/demo-app/gradle/wrapper/gradle-wrapper.jar and b/demo-app/gradle/wrapper/gradle-wrapper.jar differ diff --git a/demo-app/gradle/wrapper/gradle-wrapper.properties b/demo-app/gradle/wrapper/gradle-wrapper.properties index 1af9e09..a80b22c 100644 --- a/demo-app/gradle/wrapper/gradle-wrapper.properties +++ b/demo-app/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/demo-app/gradlew b/demo-app/gradlew index 0adc8e1..1aa94a4 100755 --- a/demo-app/gradlew +++ b/demo-app/gradlew @@ -145,7 +145,7 @@ 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 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -153,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -202,11 +202,11 @@ 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 -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ diff --git a/demo-app/settings.gradle.kts b/demo-app/settings.gradle.kts index 2bae012..1ed2be0 100644 --- a/demo-app/settings.gradle.kts +++ b/demo-app/settings.gradle.kts @@ -14,7 +14,7 @@ dependencyResolutionManagement { } } -rootProject.name = "Reveal Demo" +rootProject.name = "RevealDemo" include( ":shared", ":androidApp", diff --git a/demo-app/shared/build.gradle.kts b/demo-app/shared/build.gradle.kts index b926983..e775d72 100644 --- a/demo-app/shared/build.gradle.kts +++ b/demo-app/shared/build.gradle.kts @@ -30,24 +30,21 @@ kotlin { } sourceSets { - val commonMain by getting { - dependencies { - val revealVersion = "3.0.2" - - implementation(compose.runtime) - implementation(compose.foundation) - implementation(compose.material3) - @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) - implementation(compose.components.resources) - - implementation("com.svenjacobs.reveal:reveal-core:$revealVersion") - implementation("com.svenjacobs.reveal:reveal-shapes:$revealVersion") - } + commonMain.dependencies { + val revealVersion = "3.0.3" + + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material3) + @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + + implementation("com.svenjacobs.reveal:reveal-core:$revealVersion") + implementation("com.svenjacobs.reveal:reveal-shapes:$revealVersion") } - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - } + + commonTest.dependencies { + implementation(kotlin("test")) } } } diff --git a/demo-app/shared/src/commonTest/kotlin/.gitcreate b/demo-app/shared/src/commonTest/kotlin/.gitcreate new file mode 100644 index 0000000..e69de29 diff --git a/reveal-common/build.gradle.kts b/reveal-common/build.gradle.kts index 8f6e040..7e430b1 100644 --- a/reveal-common/build.gradle.kts +++ b/reveal-common/build.gradle.kts @@ -9,20 +9,14 @@ val publicationName by extra { "Reveal (Common)" } kotlin { sourceSets { - val commonMain by getting { - dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - } + commonMain.dependencies { + implementation(compose.runtime) + implementation(compose.foundation) } - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - } + commonTest.dependencies { + implementation(kotlin("test")) } } - - explicitApi() } val androidMinSdk: Int by rootProject.extra diff --git a/reveal-core/build.gradle.kts b/reveal-core/build.gradle.kts index 1c56873..3267c7b 100644 --- a/reveal-core/build.gradle.kts +++ b/reveal-core/build.gradle.kts @@ -9,17 +9,13 @@ val publicationName by extra { "Reveal (Core)" } kotlin { sourceSets { - val commonMain by getting { - dependencies { - api(project(":reveal-common")) - implementation(compose.runtime) - implementation(compose.foundation) - } + commonMain.dependencies { + api(project(":reveal-common")) + implementation(compose.runtime) + implementation(compose.foundation) } - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - } + commonTest.dependencies { + implementation(kotlin("test")) } } } diff --git a/reveal-shapes/build.gradle.kts b/reveal-shapes/build.gradle.kts index 6e8002a..ba0941a 100644 --- a/reveal-shapes/build.gradle.kts +++ b/reveal-shapes/build.gradle.kts @@ -9,16 +9,12 @@ val publicationName by extra { "Reveal (Shapes)" } kotlin { sourceSets { - val commonMain by getting { - dependencies { - implementation(compose.runtime) - implementation(compose.foundation) - } + commonMain.dependencies { + implementation(compose.runtime) + implementation(compose.foundation) } - val commonTest by getting { - dependencies { - implementation(kotlin("test")) - } + commonTest.dependencies { + implementation(kotlin("test")) } } }