diff --git a/compose/integrations/compose-with-ktx-serialization/.gitignore b/compose/integrations/compose-with-ktx-serialization/.gitignore new file mode 100644 index 0000000000..bf3e1b205e --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/.gitignore @@ -0,0 +1,43 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store +/.idea/ diff --git a/compose/integrations/compose-with-ktx-serialization/README.MD b/compose/integrations/compose-with-ktx-serialization/README.MD new file mode 100644 index 0000000000..2153faabc7 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/README.MD @@ -0,0 +1,9 @@ +This simple project does 2 things (for jvm, k/js, k/native): + +- ensure that Compose + kotlinx.serialization compilation works +- ensure the Composable function taking a parameter of Serializable type runs + + +To run: + +`./gradlew build -Pkotlinx.serializationCore=1.4.1 -Pkotlin.version=1.8.0 -Pcompose.version=1.3.0-rc02 -Pcompose.kotlinCompilerPluginVersion=1.4.0-alpha04` \ No newline at end of file diff --git a/compose/integrations/compose-with-ktx-serialization/build.gradle.kts b/compose/integrations/compose-with-ktx-serialization/build.gradle.kts new file mode 100644 index 0000000000..5154545273 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/build.gradle.kts @@ -0,0 +1,15 @@ +group "com.example" +version "1.0-SNAPSHOT" + +allprojects { + repositories { + google() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } +} + +plugins { + kotlin("multiplatform") apply false + id("org.jetbrains.compose") apply false +} \ No newline at end of file diff --git a/compose/integrations/compose-with-ktx-serialization/common/build.gradle.kts b/compose/integrations/compose-with-ktx-serialization/common/build.gradle.kts new file mode 100644 index 0000000000..7f7419bd14 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/common/build.gradle.kts @@ -0,0 +1,51 @@ +import org.jetbrains.compose.compose + +plugins { + kotlin("multiplatform") + id("org.jetbrains.compose") + kotlin("plugin.serialization") +} + +group = "com.example" +version = "1.0-SNAPSHOT" + +kotlin { + jvm("desktop") { + compilations.all { + kotlinOptions.jvmTarget = "11" + } + } + js(IR) { + browser() + nodejs() + } + ios() + macosX64() + macosArm64() + mingwX64() + linuxX64() + + sourceSets { + val commonMain by getting { + dependencies { + val ktxSerializationVer = project.property("kotlinx.serializationCore") + implementation(compose.runtime) + api("org.jetbrains.kotlinx:kotlinx-serialization-core:$ktxSerializationVer") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + } + } + val commonTest by getting { + dependencies { + implementation(kotlin("test")) + } + } + } +} + +compose { + val compilerPluginVersion = project.properties["compose.kotlinCompilerPluginVersion"] as? String + if (!compilerPluginVersion.isNullOrEmpty()) { + println("using compilerPluginVersion = $compilerPluginVersion") + kotlinCompilerPlugin.set(compilerPluginVersion) + } +} diff --git a/compose/integrations/compose-with-ktx-serialization/common/src/commonMain/kotlin/com/example/common/App.kt b/compose/integrations/compose-with-ktx-serialization/common/src/commonMain/kotlin/com/example/common/App.kt new file mode 100644 index 0000000000..4e599881c4 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/common/src/commonMain/kotlin/com/example/common/App.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2020-2023 JetBrains s.r.o. and respective authors and developers. + * Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE.txt file. + */ + +package com.example.common + +import androidx.compose.runtime.Composable +import kotlinx.serialization.Serializable + +@Serializable +public class Id(public val id: String) + +@Composable +fun Abc(id: Id) { + println("Id = $id") +} + +@Composable +fun App() { + Abc(Id("1000")) +} diff --git a/compose/integrations/compose-with-ktx-serialization/common/src/commonTest/kotlin/Test.kt b/compose/integrations/compose-with-ktx-serialization/common/src/commonTest/kotlin/Test.kt new file mode 100644 index 0000000000..21bd0ad70c --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/common/src/commonTest/kotlin/Test.kt @@ -0,0 +1,49 @@ +import androidx.compose.runtime.* +import com.example.common.App +import kotlinx.coroutines.* +import kotlin.test.Test +import kotlin.test.assertTrue + +class Test { + + @Test + fun Run() { + var composed = false + callComposable { + App() + composed = true + } + assertTrue(composed, "callComposable should invoke the Composable lambda") + } +} + +class UnitApplier : Applier { + override val current: Unit + get() = Unit + + override fun down(node: Unit) {} + override fun up() {} + override fun insertTopDown(index: Int, instance: Unit) {} + override fun insertBottomUp(index: Int, instance: Unit) {} + override fun remove(index: Int, count: Int) {} + override fun move(from: Int, to: Int, count: Int) {} + override fun clear() {} +} + +fun createRecomposer(): Recomposer { + val mainScope = CoroutineScope( + NonCancellable + Dispatchers.Main + DefaultMonotonicFrameClock + ) + + return Recomposer(mainScope.coroutineContext).also { + mainScope.launch(start = CoroutineStart.UNDISPATCHED) { + it.runRecomposeAndApplyChanges() + } + } +} + + +private fun callComposable(content: @Composable () -> Unit) { + val c = ControlledComposition(UnitApplier(), createRecomposer()) + c.setContent(content) +} \ No newline at end of file diff --git a/compose/integrations/compose-with-ktx-serialization/gradle.properties b/compose/integrations/compose-with-ktx-serialization/gradle.properties new file mode 100644 index 0000000000..65807bbf2c --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/gradle.properties @@ -0,0 +1,13 @@ +kotlin.code.style=official +kotlin.native.enableDependencyPropagation=false +android.useAndroidX=true +kotlin.version=1.8.0 +agp.version=7.3.0 +compose.version=1.3.0-rc02 +org.jetbrains.compose.experimental.uikit.enabled=true +org.jetbrains.compose.experimental.jscanvas.enabled=true +org.jetbrains.compose.experimental.macos.enabled=true +kotlinx.serializationCore=1.4.1 + +#empty by default - a default version will be used +compose.kotlinCompilerPluginVersion= \ No newline at end of file diff --git a/compose/integrations/compose-with-ktx-serialization/gradle/wrapper/gradle-wrapper.jar b/compose/integrations/compose-with-ktx-serialization/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..249e5832f0 Binary files /dev/null and b/compose/integrations/compose-with-ktx-serialization/gradle/wrapper/gradle-wrapper.jar differ diff --git a/compose/integrations/compose-with-ktx-serialization/gradle/wrapper/gradle-wrapper.properties b/compose/integrations/compose-with-ktx-serialization/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..ae04661ee7 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/compose/integrations/compose-with-ktx-serialization/gradlew b/compose/integrations/compose-with-ktx-serialization/gradlew new file mode 100644 index 0000000000..1b6c787337 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# 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 +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# 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 + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +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. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# 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. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/compose/integrations/compose-with-ktx-serialization/gradlew.bat b/compose/integrations/compose-with-ktx-serialization/gradlew.bat new file mode 100644 index 0000000000..107acd32c4 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/compose/integrations/compose-with-ktx-serialization/settings.gradle.kts b/compose/integrations/compose-with-ktx-serialization/settings.gradle.kts new file mode 100644 index 0000000000..ec714f3b02 --- /dev/null +++ b/compose/integrations/compose-with-ktx-serialization/settings.gradle.kts @@ -0,0 +1,19 @@ +pluginManagement { + repositories { + google() + gradlePluginPortal() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + mavenLocal() + } + + plugins { + kotlin("multiplatform").version(extra["kotlin.version"] as String) + kotlin("plugin.serialization").version(extra["kotlin.version"] as String) + id("org.jetbrains.compose").version(extra["compose.version"] as String) + } +} + +rootProject.name = "compose-with-ktx-serialization" + +include(":common")