From b2d0ee9a0d8d26bdd9954ca2bf205a5f296ed400 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Wed, 13 Sep 2023 20:12:01 +0200 Subject: [PATCH 01/14] Fix Proguard error on CI (#3675) The error: ``` java.io.IOException: Please correct the above warnings first. ``` https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_Publish_2_AllGitHubRelease/4312357?expandBuildProblemsSection=true&hideProblemsFromDependencies=false&expandBuildTestsSection=true&hideTestsFromDependencies=false&expandBuildChangesSection=true&showLog=4312349_1096_787&logFilter=debug&logView=flowAware Regression after https://github.com/JetBrains/compose-multiplatform/pull/3628 We don't need `implementation` here, `compileOnly` works for our case --- ci/templates/desktop-template/build.gradle.kts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci/templates/desktop-template/build.gradle.kts b/ci/templates/desktop-template/build.gradle.kts index 2adcc605a0b..6be3a43706a 100644 --- a/ci/templates/desktop-template/build.gradle.kts +++ b/ci/templates/desktop-template/build.gradle.kts @@ -19,7 +19,8 @@ dependencies { implementation(compose.desktop.currentOs) // Include the Test API - implementation(compose.desktop.uiTestJUnit4) + // compileOnly instead of testImplementation for checking compilation of the tutorials + compileOnly(compose.desktop.uiTestJUnit4) } compose.desktop { From aa781985727d0b02a979701f616c2f43e771d50e Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Wed, 13 Sep 2023 20:31:34 +0200 Subject: [PATCH 02/14] HTML. Rollback Kotlin to 1.8.21 (#3676) 1. It fixes CI errors: https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_PublishFast_2GradlePluginTest/4303621?hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildChangesSection=true&expandBuildProblemsSection=true&expandBuildTestsSection=true 2. We still need to support 1.8.21 in Compose 1.5 versions Regression after https://github.com/JetBrains/compose-multiplatform/pull/3631 --- html/buildSrc/gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/buildSrc/gradle.properties b/html/buildSrc/gradle.properties index bb474a25d4b..4a14484b307 100644 --- a/html/buildSrc/gradle.properties +++ b/html/buildSrc/gradle.properties @@ -1 +1 @@ -kotlin.version=1.9.10 +kotlin.version=1.8.21 From a785048e6208ae99d24a4b724065d46f291bf1e9 Mon Sep 17 00:00:00 2001 From: Igor Demin Date: Wed, 13 Sep 2023 21:11:05 +0200 Subject: [PATCH 03/14] =?UTF-8?q?Fix=20Failed=20to=20apply=20plugin=20clas?= =?UTF-8?q?s=20=E2=80=98org.gradle.toolchains.foojay.FoojayToolchainsPlugi?= =?UTF-8?q?n=E2=80=99.=20(#3677)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://teamcity.jetbrains.com/buildConfiguration/JetBrainsPublicProjects_Compose_PublishFast_4ValidateTemplatesTutorials/4312787?hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildChangesSection=true&expandBuildProblemsSection=true --- ci/templates/multiplatform-template/android/build.gradle.kts | 1 + .../android/src/main/AndroidManifest.xml | 3 +-- ci/templates/multiplatform-template/common/build.gradle.kts | 1 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci/templates/multiplatform-template/android/build.gradle.kts b/ci/templates/multiplatform-template/android/build.gradle.kts index 93c11c5f271..5ab7ec6f521 100644 --- a/ci/templates/multiplatform-template/android/build.gradle.kts +++ b/ci/templates/multiplatform-template/android/build.gradle.kts @@ -6,6 +6,7 @@ plugins { android { compileSdk = 34 + namespace = "com.myapplication" defaultConfig { minSdk = 26 diff --git a/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml b/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml index 8a21a189257..bc7e8616968 100644 --- a/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml +++ b/ci/templates/multiplatform-template/android/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + Date: Thu, 14 Sep 2023 17:20:50 +0200 Subject: [PATCH 04/14] Add benchmark for macOS K/N + rendering (#3555) * Copy jvm/native project * Implement benchmark * Add minor changes * Add minor changes * Add minor changes * Update * Change "lowest" to "worse" * Add p75 * Remove p75 * Fix naming * Update gradle properties --- benchmarks/kn-performance/.gitignore | 5 + benchmarks/kn-performance/README.md | 5 + benchmarks/kn-performance/build.gradle.kts | 83 +++++ benchmarks/kn-performance/gradle.properties | 10 + .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + benchmarks/kn-performance/gradlew | 185 ++++++++++ benchmarks/kn-performance/gradlew.bat | 91 +++++ benchmarks/kn-performance/settings.gradle.kts | 18 + .../src/commonMain/kotlin/Benchmarks.kt | 151 ++++++++ .../commonMain/kotlin/MeasureComposable.kt | 76 +++++ .../animation/AnimatedVisibility.kt | 38 +++ .../kotlin/benchmarks/lazygrid/LazyGrid.kt | 106 ++++++ .../benchmarks/visualeffects/HappyNY.kt | 321 ++++++++++++++++++ .../resources/compose-multiplatform.xml | 36 ++ .../src/desktopMain/kotlin/main.desktop.kt | 9 + .../src/macosMain/kotlin/main.macos.kt | 66 ++++ 17 files changed, 1205 insertions(+) create mode 100644 benchmarks/kn-performance/.gitignore create mode 100644 benchmarks/kn-performance/README.md create mode 100644 benchmarks/kn-performance/build.gradle.kts create mode 100644 benchmarks/kn-performance/gradle.properties create mode 100644 benchmarks/kn-performance/gradle/wrapper/gradle-wrapper.jar create mode 100644 benchmarks/kn-performance/gradle/wrapper/gradle-wrapper.properties create mode 100755 benchmarks/kn-performance/gradlew create mode 100644 benchmarks/kn-performance/gradlew.bat create mode 100644 benchmarks/kn-performance/settings.gradle.kts create mode 100644 benchmarks/kn-performance/src/commonMain/kotlin/Benchmarks.kt create mode 100644 benchmarks/kn-performance/src/commonMain/kotlin/MeasureComposable.kt create mode 100644 benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt create mode 100644 benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/lazygrid/LazyGrid.kt create mode 100644 benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/visualeffects/HappyNY.kt create mode 100644 benchmarks/kn-performance/src/commonMain/resources/compose-multiplatform.xml create mode 100644 benchmarks/kn-performance/src/desktopMain/kotlin/main.desktop.kt create mode 100644 benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt diff --git a/benchmarks/kn-performance/.gitignore b/benchmarks/kn-performance/.gitignore new file mode 100644 index 00000000000..239c7125d7e --- /dev/null +++ b/benchmarks/kn-performance/.gitignore @@ -0,0 +1,5 @@ +local.properties +build +.gradle +.idea +.DS_Store diff --git a/benchmarks/kn-performance/README.md b/benchmarks/kn-performance/README.md new file mode 100644 index 00000000000..523f2c1003f --- /dev/null +++ b/benchmarks/kn-performance/README.md @@ -0,0 +1,5 @@ +# Compose benchmarks for K/N + +## Run native on MacOS + - `./gradlew runReleaseExecutableMacosArm64` (Works on Arm64 processors) + - `./gradlew runReleaseExecutableMacosX64` (Works on Intel processors) diff --git a/benchmarks/kn-performance/build.gradle.kts b/benchmarks/kn-performance/build.gradle.kts new file mode 100644 index 00000000000..2b4f81ce91a --- /dev/null +++ b/benchmarks/kn-performance/build.gradle.kts @@ -0,0 +1,83 @@ +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + +plugins { + kotlin("multiplatform") + id("org.jetbrains.compose") +} + +version = "1.0-SNAPSHOT" + +repositories { + mavenLocal() + google() + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") +} + +kotlin { + jvm("desktop") + macosX64 { + binaries { + executable { + entryPoint = "main" + freeCompilerArgs += listOf( + "-linker-option", "-framework", "-linker-option", "Metal" + ) + } + } + } + macosArm64 { + binaries { + executable { + entryPoint = "main" + freeCompilerArgs += listOf( + "-linker-option", "-framework", "-linker-option", "Metal" + ) + } + } + } + + sourceSets { + val commonMain by getting { + dependencies { + implementation(compose.ui) + implementation(compose.foundation) + implementation(compose.material) + implementation(compose.runtime) + @OptIn(org.jetbrains.compose.ExperimentalComposeLibrary::class) + implementation(compose.components.resources) + } + } + + val desktopMain by getting { + dependencies { + implementation(compose.desktop.currentOs) + runtimeOnly("org.jetbrains.kotlinx:kotlinx-coroutines-swing:1.7.1") + } + } + + val nativeMain by creating { + dependsOn(commonMain) + } + val macosMain by creating { + dependsOn(nativeMain) + } + val macosX64Main by getting { + dependsOn(macosMain) + } + val macosArm64Main by getting { + dependsOn(macosMain) + } + } +} + +compose.desktop { + application { + mainClass = "Main_desktopKt" + } +} + +tasks.withType { + kotlinOptions.jvmTarget = "11" +} + diff --git a/benchmarks/kn-performance/gradle.properties b/benchmarks/kn-performance/gradle.properties new file mode 100644 index 00000000000..bad987c23e8 --- /dev/null +++ b/benchmarks/kn-performance/gradle.properties @@ -0,0 +1,10 @@ +compose.version=1.5.1 +kotlin.version=1.9.10 +org.gradle.jvmargs=-Xmx3g +kotlin.native.useEmbeddableCompilerJar=true +compose.desktop.verbose=true +android.useAndroidX=true +kotlin.js.webpack.major.version=4 +org.jetbrains.compose.experimental.jscanvas.enabled=true +org.jetbrains.compose.experimental.macos.enabled=true +org.jetbrains.compose.experimental.uikit.enabled=true diff --git a/benchmarks/kn-performance/gradle/wrapper/gradle-wrapper.jar b/benchmarks/kn-performance/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e708b1c023ec8b20f512888fe07c5bd3ff77bb8f GIT binary patch literal 59203 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

K7UpUK$>l@ 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 E2O(~oYXATM literal 0 HcmV?d00001 diff --git a/benchmarks/kn-performance/gradle/wrapper/gradle-wrapper.properties b/benchmarks/kn-performance/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000000..ae04661ee73 --- /dev/null +++ b/benchmarks/kn-performance/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/benchmarks/kn-performance/gradlew b/benchmarks/kn-performance/gradlew new file mode 100755 index 00000000000..4f906e0c811 --- /dev/null +++ b/benchmarks/kn-performance/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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 "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/benchmarks/kn-performance/gradlew.bat b/benchmarks/kn-performance/gradlew.bat new file mode 100644 index 00000000000..f127cfd49d4 --- /dev/null +++ b/benchmarks/kn-performance/gradlew.bat @@ -0,0 +1,91 @@ +@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% equ 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% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/benchmarks/kn-performance/settings.gradle.kts b/benchmarks/kn-performance/settings.gradle.kts new file mode 100644 index 00000000000..b39db44fad8 --- /dev/null +++ b/benchmarks/kn-performance/settings.gradle.kts @@ -0,0 +1,18 @@ +pluginManagement { + repositories { + mavenLocal() + mavenCentral() + gradlePluginPortal() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + google() + } + + plugins { + val kotlinVersion = extra["kotlin.version"] as String + kotlin("multiplatform").version(kotlinVersion) + val composeVersion = extra["compose.version"] as String + id("org.jetbrains.compose").version(composeVersion) + } +} + +rootProject.name = "compose-benchmarks" diff --git a/benchmarks/kn-performance/src/commonMain/kotlin/Benchmarks.kt b/benchmarks/kn-performance/src/commonMain/kotlin/Benchmarks.kt new file mode 100644 index 00000000000..cd2d006c3a3 --- /dev/null +++ b/benchmarks/kn-performance/src/commonMain/kotlin/Benchmarks.kt @@ -0,0 +1,151 @@ +import androidx.compose.runtime.Composable +import benchmarks.animation.AnimatedVisibility +import benchmarks.lazygrid.LazyGrid +import benchmarks.visualeffects.NYContent +import kotlin.math.roundToInt +import kotlin.time.Duration + +enum class BenchmarkFrameTimeKind { + CPU, GPU +} + + +fun BenchmarkFrameTimeKind.toPrettyPrintString(): String = + when (this) { + BenchmarkFrameTimeKind.CPU -> "CPU" + BenchmarkFrameTimeKind.GPU -> "GPU" + } + +data class BenchmarkFrame( + val cpuDuration: Duration, + val gpuDuration: Duration +) { + fun duration(kind: BenchmarkFrameTimeKind): Duration = + when (kind) { + BenchmarkFrameTimeKind.CPU -> cpuDuration + BenchmarkFrameTimeKind.GPU -> gpuDuration + } +} + +data class BenchmarkPercentileAverage( + val percentile: Double, + val average: Duration +) + +data class MissedFrames( + val count: Int, + val ratio: Double +) { + fun prettyPrint(description: String) { + println( + """ + Missed frames ($description): + - count: $count + - ratio: $ratio + + """.trimIndent() + ) + } +} + +data class BenchmarkStats( + val frameBudget: Duration, + val percentileCPUAverage: List, + val percentileGPUAverage: List, + val noBufferingMissedFrames: MissedFrames, + val doubleBufferingMissedFrames: MissedFrames +) { + fun prettyPrint() { + percentileCPUAverage.prettyPrint(BenchmarkFrameTimeKind.CPU) + println() + percentileGPUAverage.prettyPrint(BenchmarkFrameTimeKind.GPU) + println() + noBufferingMissedFrames.prettyPrint("no buffering") + doubleBufferingMissedFrames.prettyPrint("double buffering") + } + + private fun List.prettyPrint(kind: BenchmarkFrameTimeKind) { + forEach { + println("Worst p${(it.percentile * 100).roundToInt()} ${kind.toPrettyPrintString()} average: ${it.average}") + } + } +} + +class BenchmarkResult( + private val frameBudget: Duration, + private val frames: List, +) { + private fun percentileAverageFrameTime(percentile: Double, kind: BenchmarkFrameTimeKind): Duration { + require(percentile in 0.0..1.0) + + val startIndex = ((frames.size - 1) * percentile).roundToInt() + + val percentileFrames = frames.sortedBy { it.duration(kind) }.subList(frames.size - startIndex - 1, frames.size) + + return averageDuration(percentileFrames) { + it.duration(kind) + } + } + + fun generateStats(): BenchmarkStats { + val noBufferingMissedFramesCount = frames.count { + it.cpuDuration + it.gpuDuration > frameBudget + } + + val doubleBufferingMissedFrames = frames.count { + maxOf(it.cpuDuration, it.gpuDuration) > frameBudget + } + + return BenchmarkStats( + frameBudget, + listOf(0.01, 0.02, 0.05, 0.1, 0.25, 0.5).map { percentile -> + val average = percentileAverageFrameTime(percentile, BenchmarkFrameTimeKind.CPU) + + BenchmarkPercentileAverage(percentile, average) + }, + listOf(0.01, 0.1, 0.5).map { percentile -> + val average = percentileAverageFrameTime(percentile, BenchmarkFrameTimeKind.GPU) + + BenchmarkPercentileAverage(percentile, average) + }, + MissedFrames(noBufferingMissedFramesCount, noBufferingMissedFramesCount / frames.size.toDouble()), + MissedFrames(doubleBufferingMissedFrames, doubleBufferingMissedFrames / frames.size.toDouble()) + ) + } + + private fun averageDuration(frames: List, selector: (BenchmarkFrame) -> Duration): Duration = + frames.fold(Duration.ZERO) { acc, frame -> + acc + selector(frame) + } / frames.size + +} + +fun runBenchmark( + name: String, + width: Int, + height: Int, + targetFps: Int, + frameCount: Int, + graphicsContext: GraphicsContext?, + content: @Composable () -> Unit +): BenchmarkStats { + val stats = measureComposable(frameCount, width, height, targetFps, graphicsContext, content).generateStats() + + println(name) + stats.prettyPrint() + println() + + return stats +} + +fun runBenchmarks( + width: Int = 1920, + height: Int = 1080, + targetFps: Int = 120, + graphicsContext: GraphicsContext? = null +) { + println("Running emulating $targetFps FPS") + runBenchmark("AnimatedVisibility", width, height, targetFps, 1000, graphicsContext) { AnimatedVisibility() } + runBenchmark("LazyGrid", width, height, targetFps, 1000, graphicsContext) { LazyGrid() } + runBenchmark("VisualEffects", width, height, targetFps, 1000, graphicsContext) { NYContent(width, height) } +} \ No newline at end of file diff --git a/benchmarks/kn-performance/src/commonMain/kotlin/MeasureComposable.kt b/benchmarks/kn-performance/src/commonMain/kotlin/MeasureComposable.kt new file mode 100644 index 00000000000..f614668ea32 --- /dev/null +++ b/benchmarks/kn-performance/src/commonMain/kotlin/MeasureComposable.kt @@ -0,0 +1,76 @@ +import androidx.compose.runtime.Composable +import androidx.compose.ui.ComposeScene +import androidx.compose.ui.unit.Constraints +import org.jetbrains.skia.DirectContext +import org.jetbrains.skia.Surface +import kotlin.time.Duration +import kotlin.time.Duration.Companion.nanoseconds +import kotlin.time.ExperimentalTime +import kotlin.time.measureTime +import kotlinx.coroutines.* + +const val nanosPerSecond = 1E9.toLong() +const val millisPerSecond = 1e3.toLong() +const val nanosPerMillisecond = nanosPerSecond / millisPerSecond + +interface GraphicsContext { + fun surface(width: Int, height: Int): Surface + + suspend fun awaitGPUCompletion() +} + +@OptIn(ExperimentalTime::class) +fun measureComposable( + frameCount: Int = 500, + width: Int, + height: Int, + targetFps: Int, + graphicsContext: GraphicsContext?, + content: @Composable () -> Unit +): BenchmarkResult = runBlocking { + val scene = ComposeScene() + try { + val nanosPerFrame = (1.0 / targetFps.toDouble() * nanosPerSecond).toLong() + scene.setContent(content) + scene.constraints = Constraints.fixed(width, height) + val surface = graphicsContext?.surface(width, height) ?: Surface.makeNull(width, height) + + val frames = MutableList(frameCount) { + BenchmarkFrame(Duration.INFINITE, Duration.INFINITE) + } + + var nanoTime = 0L + + repeat(frameCount) { + val frameTime = measureTime { + val cpuTime = measureTime { + scene.render(surface.canvas, nanoTime) + surface.flushAndSubmit(false) + } + + val gpuTime = measureTime { + graphicsContext?.awaitGPUCompletion() + } + + frames[it] = BenchmarkFrame(cpuTime, gpuTime) + } + + val actualNanosPerFrame = frameTime.inWholeNanoseconds + val nanosUntilDeadline = nanosPerFrame - actualNanosPerFrame + + // Emulate waiting for next vsync + if (nanosUntilDeadline > 0) { + delay(nanosUntilDeadline / nanosPerMillisecond) + } + + nanoTime += maxOf(actualNanosPerFrame, nanosPerFrame) + } + + BenchmarkResult( + nanosPerFrame.nanoseconds, + frames + ) + } finally { + scene.close() + } +} diff --git a/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt new file mode 100644 index 00000000000..ea3144ff18a --- /dev/null +++ b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/animation/AnimatedVisibility.kt @@ -0,0 +1,38 @@ +package benchmarks.animation + +import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.Image +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.material.MaterialTheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import kotlinx.coroutines.delay +import org.jetbrains.compose.resources.ExperimentalResourceApi +import org.jetbrains.compose.resources.painterResource + +@OptIn(ExperimentalResourceApi::class) +@Composable +fun AnimatedVisibility() { + MaterialTheme { + var showImage by remember { mutableStateOf(false) } + LaunchedEffect(showImage) { + delay(200) + showImage = !showImage + } + Column(Modifier.fillMaxWidth(), horizontalAlignment = Alignment.CenterHorizontally) { + AnimatedVisibility(showImage) { + Image( + painterResource("compose-multiplatform.xml"), + null + ) + } + } + } +} \ No newline at end of file diff --git a/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/lazygrid/LazyGrid.kt b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/lazygrid/LazyGrid.kt new file mode 100644 index 00000000000..386630f9a07 --- /dev/null +++ b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/lazygrid/LazyGrid.kt @@ -0,0 +1,106 @@ +package benchmarks.lazygrid + +import androidx.compose.foundation.gestures.scrollBy +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.grid.GridCells +import androidx.compose.foundation.lazy.grid.LazyVerticalGrid +import androidx.compose.foundation.lazy.grid.items +import androidx.compose.foundation.lazy.grid.rememberLazyGridState +import androidx.compose.material.Card +import androidx.compose.material.Checkbox +import androidx.compose.material.MaterialTheme +import androidx.compose.material.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.runtime.withFrameMillis +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.semantics.contentDescription +import androidx.compose.ui.semantics.semantics +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp + +@Composable +fun LazyGrid() { + val itemCount = 12000 + val entries = remember {List(itemCount) { Entry("$it") }} + val state = rememberLazyGridState() + + var smoothScroll by remember { mutableStateOf(false)} + + MaterialTheme { + Column { + Row { + Checkbox( + checked = smoothScroll, + onCheckedChange = { value -> smoothScroll = value} + ) + Text (text = "Smooth scroll", modifier = Modifier.align(Alignment.CenterVertically)) + } + + LazyVerticalGrid( + columns = GridCells.Fixed(4), + modifier = Modifier.fillMaxWidth().semantics { contentDescription = "IamLazy" }, + state = state + ) { + items(entries) { + ListCell(it) + } + } + } + + } + + var curItem by remember { mutableStateOf(0) } + var direct by remember { mutableStateOf(true) } + if (smoothScroll) { + LaunchedEffect(Unit) { + while (smoothScroll) { + withFrameMillis { } + curItem = state.firstVisibleItemIndex + if (curItem == 0) direct = true + if (curItem > itemCount - 100) direct = false + state.scrollBy(if (direct) 5f else -5f) + } + } + } else { + LaunchedEffect(curItem) { + withFrameMillis { } + curItem += if (direct) 50 else -50 + if (curItem >= itemCount) { + direct = false + curItem = itemCount - 1 + } else if (curItem <= 0) { + direct = true + curItem = 0 + } + state.scrollToItem(curItem) + } + } + +} + +data class Entry(val contents: String) + +@Composable +private fun ListCell(entry: Entry) { + Card( + modifier = Modifier + .fillMaxWidth() + .padding(8.dp) + ) { + Text( + text = entry.contents, + textAlign = TextAlign.Center, + style = MaterialTheme.typography.h5, + modifier = Modifier.padding(16.dp) + ) + } +} \ No newline at end of file diff --git a/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/visualeffects/HappyNY.kt b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/visualeffects/HappyNY.kt new file mode 100644 index 00000000000..ae07af509e0 --- /dev/null +++ b/benchmarks/kn-performance/src/commonMain/kotlin/benchmarks/visualeffects/HappyNY.kt @@ -0,0 +1,321 @@ +package benchmarks.visualeffects + +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.* +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material.Surface +import androidx.compose.runtime.* +import androidx.compose.runtime.snapshots.SnapshotStateList +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.* +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.unit.Dp +import androidx.compose.ui.unit.dp + +import kotlin.math.* +import kotlin.random.Random + +const val snowCount = 80 +const val starCount = 60 +const val rocketPartsCount = 30 + +data class SnowFlake( + var x: Dp, + var y: Dp, + val scale: Float, + var v: Double, + var alpha: Float, + var angle: Float, + var rotate: Int, + var phase: Double +) + +data class Star(val x: Dp, val y: Dp, val color: Color, val size: Dp) + +val random = Random(123) + +fun random(): Float = random.nextFloat() + +class DoubleRocket(val particle: Particle) { + private val STATE_ROCKET = 0 + private val STATE_SMALL_ROCKETS = 1 + var state = STATE_ROCKET + var rockets: Array = emptyArray() + private fun checkState(time: Long) { + if (particle.vy > -3.0 && state == STATE_ROCKET) { + explode(time) + } + if (state == STATE_SMALL_ROCKETS) { + var done = true + rockets.forEach { + if (!it.exploded) { + it.checkExplode(time) + } + if (!it.checkDone()) { + done = false + } + } + if (done) { + reset() + } + } + } + + private fun reset() { + state = STATE_ROCKET + particle.x = 0.0 + particle.y = 1000.0 + particle.vx = 2.1 + particle.vy = -12.5 + } + + private fun explode(time: Long) { + val colors = arrayOf(Color(0xff, 0, 0), Color(192, 255, 192), Color(192, 212, 255)) + rockets = Array(7) { + val v = 1.2f + 1.0 * random() + val angle = 2 * PI * random() + Rocket( + Particle( + particle.x, + particle.y, + v * sin(angle) + particle.vx, + v * cos(angle) + particle.vy - 0.5f, + colors[it % colors.size] + ), colors[it % colors.size], time + ) + } + state = STATE_SMALL_ROCKETS + } + + fun move(time: Long, prevTime: Long) { + if (rocket.state == rocket.STATE_ROCKET) { + rocket.particle.move(time, prevTime) + rocket.particle.gravity(time, prevTime) + } else { + rocket.rockets.forEach { + it.move(time, prevTime) + } + } + rocket.checkState(time) + } + + @Composable + fun draw() { + if (state == rocket.STATE_ROCKET) { + particle.draw() + } else { + rockets.forEach { + it.draw() + } + } + } + +} + +class Rocket(val particle: Particle, val color: Color, val startTime: Long = 0) { + var exploded = false + var parts: Array = emptyArray() + + fun checkExplode(time: Long) { + if (time - startTime > 1200000000) { + explode() + } + } + + private fun explode() { + parts = Array(rocketPartsCount) { + val v = 0.5f + 1.5 * random() + val angle = 2 * PI * random() + Particle(particle.x, particle.y, v * sin(angle) + particle.vx, v * cos(angle) + particle.vy, color, 1) + } + exploded = true + } + + fun checkDone(): Boolean { + if (!exploded) return false + parts.forEach { + if (it.y < 800) return false + } + return true + } + + fun move(time: Long, prevTime: Long) { + if (!exploded) { + particle.move(time, prevTime) + particle.gravity(time, prevTime) + checkExplode(time) + } else { + parts.forEach { + it.move(time, prevTime) + it.gravity(time, prevTime) + } + } + } + + @Composable + fun draw() { + if (!exploded) { + particle.draw() + } else { + parts.forEach { + it.draw() + } + } + } +} + +class Particle(var x: Double, var y: Double, var vx: Double, var vy: Double, val color: Color, val type: Int = 0) { + fun move(time: Long, prevTime: Long) { + x = (x + vx * (time - prevTime) / 30000000) + y = (y + vy * (time - prevTime) / 30000000) + } + + fun gravity(time: Long, prevTime: Long) { + vy = vy + 1.0f * (time - prevTime) / 300000000 + } + + @Composable + fun draw() { + val alphaFactor = if (type == 0) 1.0f else 1 / (1 + abs(vy / 5)).toFloat() + Box(Modifier.size(5.dp).offset(x.dp, y.dp).alpha(alphaFactor).clip(CircleShape).background(color)) + for (i in 1..5) { + Box( + Modifier.size(4.dp).offset((x - vx / 2 * i).dp, (y - vy / 2 * i).dp) + .alpha(alphaFactor * (1 - 0.18f * i)).clip(CircleShape).background(color) + ) + } + } +} + +val rocket = DoubleRocket(Particle(0.0, 1000.0, 2.1, -12.5, Color.White)) + +fun prepareStarsAndSnowFlakes(stars: SnapshotStateList, snowFlakes: SnapshotStateList, width: Int, height: Int) { + for (i in 0..snowCount) { + snowFlakes.add( + SnowFlake( + (50 + (width - 50) * random()).dp, + (height * random()).dp, + 0.1f + 0.2f * random(), + 1.5 + 3 * random(), + (0.4f + 0.4 * random()).toFloat(), + 60 * random(), + Random.nextInt(1, 5) - 3, + random() * 2 * PI + ) + ) + } + val colors = arrayOf(Color.Red, Color.Yellow, Color.Green, Color.Yellow, Color.Cyan, Color.Magenta, Color.White) + for (i in 0..starCount) { + stars.add( + Star( + (width * random()).dp, + (height * random()).dp, + colors[Random.nextInt(colors.size)], + (3 + 5 * random()).dp + ) + ) + } +} + +@Composable +fun NYContent(width: Int, height: Int) { + var time by remember { mutableStateOf(0L) } + val startTime = remember { 0L } + var prevTime by remember { mutableStateOf(0L) } + val snowFlakes = remember { mutableStateListOf() } + val stars = remember { mutableStateListOf() } + var flickering2 by remember { mutableStateOf(true) } + remember { prepareStarsAndSnowFlakes(stars, snowFlakes, width, height) } + + Surface( + modifier = Modifier.fillMaxSize().padding(5.dp).shadow(3.dp, RoundedCornerShape(20.dp)), + color = Color.Black, + shape = RoundedCornerShape(20.dp) + ) { + + LaunchedEffect(Unit) { + while (true) { + withFrameNanos { + prevTime = time + time = it + } + } + } + + if (flickering2) { + if (time - startTime > 15500000000) { //note, that startTime has been updated above + flickering2 = false + } + } + + rocket.move(time, prevTime) + + Box(Modifier.fillMaxSize()) { + + snow(time, prevTime, snowFlakes, startTime, height) + + starrySky(stars) + + rocket.draw() + + } + } +} + + +@Composable +fun starrySky(stars: SnapshotStateList) { + stars.forEach { + star(it.x, it.y, it.color, size = it.size) + } +} + +@Composable +fun star(x: Dp, y: Dp, color: Color = Color.White, size: Dp) { + Box(Modifier.offset(x, y).scale(1.0f, 0.2f).rotate(45f).size(size).background(color)) + Box(Modifier.offset(x, y).scale(0.2f, 1.0f).rotate(45f).size(size).background(color)) +} + +@Composable +fun snow(time: Long, prevTime: Long, snowFlakes: SnapshotStateList, startTime: Long, height: Int) { + val deltaAngle = (time - startTime) / 100000000 + with(LocalDensity.current) { + snowFlakes.forEach { + var y = it.y + ((it.v * (time - prevTime)) / 300000000).dp + if (y > (height + 20).dp) { + y = -20.dp + } + it.y = y + val x = it.x + (15 * sin(time.toDouble() / 3000000000 + it.phase)).dp + snowFlake(Modifier.offset(x, y).scale(it.scale).rotate(it.angle + deltaAngle * it.rotate), it.alpha) + } + } +} + +@Composable +fun snowFlake(modifier: Modifier, alpha: Float = 0.8f) { + Box(modifier) { + snowFlakeInt(0, 0f, 30.dp, 0.dp, alpha) + snowFlakeInt(0, 60f, 15.dp, 25.dp, alpha) + snowFlakeInt(0, 120f, -15.dp, 25.dp, alpha) + snowFlakeInt(0, 180f, -30.dp, 0.dp, alpha) + snowFlakeInt(0, 240f, -15.dp, -25.dp, alpha) + snowFlakeInt(0, 300f, 15.dp, -25.dp, alpha) + } + +} + +@Composable +fun snowFlakeInt(level: Int, angle: Float, shiftX: Dp, shiftY: Dp, alpha: Float) { + if (level > 3) return + Box( + Modifier.offset(shiftX, shiftY).rotate(angle).width(100.dp).height(10.dp).scale(0.6f).alpha(1f) + .background(Color.White.copy(alpha = alpha)) + ) { + snowFlakeInt(level + 1, 30f, 12.dp, 20.dp, alpha * 0.8f) + snowFlakeInt(level + 1, -30f, 12.dp, -20.dp, alpha * 0.8f) + } +} + diff --git a/benchmarks/kn-performance/src/commonMain/resources/compose-multiplatform.xml b/benchmarks/kn-performance/src/commonMain/resources/compose-multiplatform.xml new file mode 100644 index 00000000000..d7bf7955f44 --- /dev/null +++ b/benchmarks/kn-performance/src/commonMain/resources/compose-multiplatform.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/benchmarks/kn-performance/src/desktopMain/kotlin/main.desktop.kt b/benchmarks/kn-performance/src/desktopMain/kotlin/main.desktop.kt new file mode 100644 index 00000000000..6d1367a1a87 --- /dev/null +++ b/benchmarks/kn-performance/src/desktopMain/kotlin/main.desktop.kt @@ -0,0 +1,9 @@ +/* + * Copyright 2020-2021 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. + */ + +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.runBlocking + +fun main() = runBlocking(Dispatchers.Main) { runBenchmarks() } diff --git a/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt b/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt new file mode 100644 index 00000000000..73adc79d6b6 --- /dev/null +++ b/benchmarks/kn-performance/src/macosMain/kotlin/main.macos.kt @@ -0,0 +1,66 @@ +import kotlinx.cinterop.ExperimentalForeignApi +import kotlinx.cinterop.objcPtr +import org.jetbrains.skia.* +import platform.Metal.* +import kotlin.coroutines.resume +import kotlin.coroutines.suspendCoroutine + +/* + * Copyright 2020-2021 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. + */ + +@OptIn(ExperimentalForeignApi::class) +fun main() { + val graphicsContext = object : GraphicsContext { + private val device = MTLCreateSystemDefaultDevice() ?: throw IllegalStateException("Can't create MTLDevice") + private val commandQueue = device.newCommandQueue() ?: throw IllegalStateException("Can't create MTLCommandQueue") + private val directContext = DirectContext.makeMetal(device.objcPtr(), commandQueue.objcPtr()) + private var cachedSurface: Surface? = null + + override fun surface(width: Int, height: Int): Surface { + val oldSurface = cachedSurface + + if (oldSurface != null && oldSurface.width == width && oldSurface.height == height) { + return oldSurface + } + + val descriptor = MTLTextureDescriptor() + descriptor.width = width.toULong() + descriptor.height = height.toULong() + descriptor.usage = MTLTextureUsageShaderRead or MTLTextureUsageShaderWrite or MTLTextureUsageRenderTarget + descriptor.textureType = MTLTextureType2D + descriptor.pixelFormat = MTLPixelFormatBGRA8Unorm + descriptor.mipmapLevelCount = 1UL + + val texture = device.newTextureWithDescriptor(descriptor) ?: throw IllegalStateException("Can't create MTLTexture") + + val renderTarget = BackendRenderTarget.makeMetal(width, height, texture.objcPtr()) + + return Surface.makeFromBackendRenderTarget( + directContext, + renderTarget, + SurfaceOrigin.TOP_LEFT, + SurfaceColorFormat.BGRA_8888, + ColorSpace.sRGB, + SurfaceProps(pixelGeometry = PixelGeometry.UNKNOWN) + ).also { + cachedSurface = it + } ?: throw IllegalStateException("Can't create Surface") + } + + override suspend fun awaitGPUCompletion() { + val commandBuffer = commandQueue.commandBuffer() ?: return + + suspendCoroutine { continuation -> + commandBuffer.addCompletedHandler { + continuation.resume(Unit) + } + + commandBuffer.commit() + } + } + } + + runBenchmarks(graphicsContext = graphicsContext) +} From c9388f41b3a511ccff40430fcc14721746736224 Mon Sep 17 00:00:00 2001 From: Nikolai Rykunov Date: Thu, 14 Sep 2023 13:31:57 +0200 Subject: [PATCH 05/14] Use GradlePluginDevelopmentExtension to set metadata for gradle plugin (#3678) --- gradle-plugins/build.gradle.kts | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gradle-plugins/build.gradle.kts b/gradle-plugins/build.gradle.kts index 9e06648b0a8..54b2ded2454 100644 --- a/gradle-plugins/build.gradle.kts +++ b/gradle-plugins/build.gradle.kts @@ -103,20 +103,18 @@ fun Project.configureMavenPublication( } } +@Suppress("UnstableApiUsage") fun Project.configureGradlePlugin( publicationConfig: MavenPublicationConfigExtension, gradlePluginConfig: GradlePluginConfigExtension ) { - // metadata for gradle plugin portal (relates to pluginBundle extension block from com.gradle.plugin-publish) - configureIfExists { - vcsUrl = BuildProperties.vcs - website = BuildProperties.website - description = publicationConfig.description - tags = gradlePluginConfig.pluginPortalTags - } - // gradle plugin definition (relates to gradlePlugin extension block from java-gradle-plugin) + // and metadata for gradle plugin portal (relates to pluginBundle extension block from com.gradle.plugin-publish) configureIfExists { + vcsUrl.set(BuildProperties.vcs) + website.set(BuildProperties.website) + description = publicationConfig.description + plugins { create("gradlePlugin") { id = gradlePluginConfig.pluginId @@ -124,6 +122,7 @@ fun Project.configureGradlePlugin( description = publicationConfig.description implementationClass = gradlePluginConfig.implementationClass version = project.version + tags.set(gradlePluginConfig.pluginPortalTags) } } } From f14bf93058a215f780fefe9d4aecab6b47d718c1 Mon Sep 17 00:00:00 2001 From: Nikolai Rykunov Date: Thu, 14 Sep 2023 20:22:50 +0200 Subject: [PATCH 06/14] Update Change Log for 1.5.10-beta01 (#3681) --------- Co-authored-by: Igor Demin --- CHANGELOG.md | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94c08a48666..e6a9410c31d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,63 @@ +# 1.5.10-beta01 (September 2023) + +## Common + +### Features +* [Support Kotlin 1.9.20-Beta](https://github.com/JetBrains/compose-multiplatform/pull/3656) +* Introduce Material 3 components in common + * [`ModalBottomSheet`](https://github.com/JetBrains/compose-multiplatform-core/pull/794) + * [`SearchBar` and `DockedSearchBar`](https://github.com/JetBrains/compose-multiplatform-core/pull/801) + * [`ExposedDropDownMenu`](https://github.com/JetBrains/compose-multiplatform-core/pull/787) +* [Introduce Material component `ExposedDropDownMenu` in common](https://github.com/JetBrains/compose-multiplatform-core/pull/793) +* [Introduce `WindowInfo.containerSize` experimental api](https://github.com/JetBrains/compose-multiplatform-core/pull/785) + +## iOS + +### Breaking changes +* [Having `kotlin.native.cacheKind = none` will result in a build error.](https://github.com/JetBrains/compose-multiplatform/pull/3667) + +### Features + +* [Compilation speed up due to enabling compiler caches for Kotlin 1.9.20+](https://github.com/JetBrains/compose-multiplatform/pull/3648) +* [Added crossfade animation during orientation change when used within UIKit hierarchy](https://github.com/JetBrains/compose-multiplatform-core/pull/778) +* [Compose Multiplatform should warn when `CADisableMinimumFrameDurationOnPhone` is not configured properly](https://github.com/JetBrains/compose-multiplatform/issues/3634) +* [Fast delete mode on software keyboard. When you hold a backspace, “turbo mode” is enabled after deleting the first 21 symbols. In turbo mode each tick deletes two words.](https://github.com/JetBrains/compose-multiplatform/issues/2991) +* [On a long scrollable TextFields, If it’s scrolled up to caret position while typing. Then it stopped on the line above the line with a caret.](https://github.com/JetBrains/compose-multiplatform-core/pull/804) +* [Add `UIViewController` lifetime hooks](https://github.com/JetBrains/compose-multiplatform-core/pull/779) +* [Implement iOS native feel scrolls for large text fields](https://github.com/JetBrains/compose-multiplatform-core/pull/771) + +### Fixes +* [Rendering synchronization of multiple `UIKitView`s within a screen](https://github.com/JetBrains/compose-multiplatform/issues/3534) +* [Today's date is not highlighted with a circle in the material3 datePicker on iOS](https://github.com/JetBrains/compose-multiplatform/issues/3591) +* [Fix text-to-speech crash in iOS 16.0.*](https://github.com/JetBrains/compose-multiplatform/issues/2984) +* [Compose window is shown before the first frame is rendered](https://github.com/JetBrains/compose-multiplatform/issues/3492) +* [iOS TextField, Compound emojis are being treated as many symbols](https://github.com/JetBrains/compose-multiplatform/issues/3104) +* [Use `CADisplayLink.targetTimestamp` value as the time for animation frames](https://github.com/JetBrains/compose-multiplatform-core/pull/796) +* [iOS. Improved performance on 120 hz devices](https://github.com/JetBrains/compose-multiplatform-core/pull/797) + +## Desktop + +### Fixes +* [`LocalLayoutDirection` isn't propagated into `DialogWindow`](https://github.com/JetBrains/compose-multiplatform/issues/3382) +* [CompositionLocals given in application scope are not take into account in window scope (such as `LocalLayoutDirection`)](https://github.com/JetBrains/compose-multiplatform/issues/3571) +* [Fix accessibility issue with actions in popups](https://github.com/JetBrains/compose-multiplatform-core/pull/792) +* [Apply custom Dialog's scrim blend mode only when window is transparent](https://github.com/JetBrains/compose-multiplatform-core/pull/812) + +## Gradle Plugin + +### Fixes +* [Increase Kotlinx Serialization version used by the Compose Gradle Plugin](https://github.com/JetBrains/compose-multiplatform/issues/3479) + +## Dependencies + +This version of Compose Multiplatform is based on the next Jetpack Compose libraries: +* [Compiler 1.5.3](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.3) +* [Runtime 1.5.1](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.5.1) +* [UI 1.5.1](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.5.1) +* [Foundation 1.5.1](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.5.1) +* [Material 1.5.1](https://developer.android.com/jetpack/androidx/releases/compose-material#1.5.1) +* [Material3 1.1.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.1.1) + # 1.5.1 (September 2023) ## Common From 93a8316226aa683bdc2ac7af8efd678b05d06783 Mon Sep 17 00:00:00 2001 From: Nikolai Rykunov Date: Wed, 13 Sep 2023 18:28:49 +0200 Subject: [PATCH 07/14] Remove kotlin.native.cacheKind=none (#3674) --- benchmarks/ios/animation-from-template/gradle.properties | 1 - benchmarks/ios/jvm-vs-kotlin-native/gradle.properties | 1 - benchmarks/ios/scroll-lazy-grid/gradle.properties | 1 - benchmarks/ios/scroll-lazy-list/gradle.properties | 1 - benchmarks/ios/visual-effects-ny/gradle.properties | 1 - components/gradle.properties | 1 - compose/integrations/composable-test-cases/gradle.properties | 1 - 7 files changed, 7 deletions(-) diff --git a/benchmarks/ios/animation-from-template/gradle.properties b/benchmarks/ios/animation-from-template/gradle.properties index 2fa452fa943..402848dbea3 100644 --- a/benchmarks/ios/animation-from-template/gradle.properties +++ b/benchmarks/ios/animation-from-template/gradle.properties @@ -11,7 +11,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 #Compose org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.native.cacheKind=none #Android android.useAndroidX=true diff --git a/benchmarks/ios/jvm-vs-kotlin-native/gradle.properties b/benchmarks/ios/jvm-vs-kotlin-native/gradle.properties index fd43f207406..ea3799cf6ba 100644 --- a/benchmarks/ios/jvm-vs-kotlin-native/gradle.properties +++ b/benchmarks/ios/jvm-vs-kotlin-native/gradle.properties @@ -3,7 +3,6 @@ kotlin.version=1.8.20 agp.version=7.0.4 org.gradle.jvmargs=-Xmx3g kotlin.code.style=official -kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true diff --git a/benchmarks/ios/scroll-lazy-grid/gradle.properties b/benchmarks/ios/scroll-lazy-grid/gradle.properties index 2fa452fa943..402848dbea3 100644 --- a/benchmarks/ios/scroll-lazy-grid/gradle.properties +++ b/benchmarks/ios/scroll-lazy-grid/gradle.properties @@ -11,7 +11,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 #Compose org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.native.cacheKind=none #Android android.useAndroidX=true diff --git a/benchmarks/ios/scroll-lazy-list/gradle.properties b/benchmarks/ios/scroll-lazy-list/gradle.properties index 2fa452fa943..402848dbea3 100644 --- a/benchmarks/ios/scroll-lazy-list/gradle.properties +++ b/benchmarks/ios/scroll-lazy-list/gradle.properties @@ -11,7 +11,6 @@ kotlin.mpp.androidSourceSetLayoutVersion=2 #Compose org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.native.cacheKind=none #Android android.useAndroidX=true diff --git a/benchmarks/ios/visual-effects-ny/gradle.properties b/benchmarks/ios/visual-effects-ny/gradle.properties index cad8e0734a6..1c9caed4200 100644 --- a/benchmarks/ios/visual-effects-ny/gradle.properties +++ b/benchmarks/ios/visual-effects-ny/gradle.properties @@ -7,7 +7,6 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true kotlin.mpp.androidSourceSetLayoutVersion=2 -kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true # Enable kotlin/native experimental memory model kotlin.native.binary.memoryModel=experimental diff --git a/components/gradle.properties b/components/gradle.properties index 7c56aa1e151..a681f351fc4 100644 --- a/components/gradle.properties +++ b/components/gradle.properties @@ -11,7 +11,6 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true org.jetbrains.compose.experimental.macos.enabled=true org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.native.cacheKind=none kotlin.native.useEmbeddableCompilerJar=true kotlin.native.enableDependencyPropagation=false kotlin.mpp.enableGranularSourceSetsMetadata=true diff --git a/compose/integrations/composable-test-cases/gradle.properties b/compose/integrations/composable-test-cases/gradle.properties index b663a23a44b..caaa0b5eccf 100644 --- a/compose/integrations/composable-test-cases/gradle.properties +++ b/compose/integrations/composable-test-cases/gradle.properties @@ -5,7 +5,6 @@ android.useAndroidX=true kotlin.version=1.9.10 agp.version=7.3.0 compose.version=1.5.1 -kotlin.native.cacheKind=none #empty by default - a default version will be used compose.kotlinCompilerPluginVersion=1.5.2 From 50d45f33266518f8b097c04a647c1193b2d6a41d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:48:48 +0300 Subject: [PATCH 08/14] Switch to notarytool for notarization (#3642) See https://github.com/JetBrains/compose-multiplatform/pull/3642 for details Resolves #3208 Resolves #2253 --------- Co-authored-by: Michael Rittmeister --- .../dsl/MacOSNotarizationSettings.kt | 13 ++- .../internal/ComposeProjectProperties.kt | 6 +- .../internal/ExternalToolRunner.kt | 8 +- .../internal/configureJvmApplication.kt | 13 +-- .../ValidatedMacOSNotarizationSettings.kt | 14 +-- .../AbstractCheckNotarizationStatusTask.kt | 60 ------------- .../tasks/AbstractNotarizationTask.kt | 65 +++++++++++--- .../AbstractUploadAppForNotarizationTask.kt | 82 ------------------ .../README.md | 81 +++++++++-------- .../notarization-team-id.png | Bin 0 -> 50417 bytes 10 files changed, 125 insertions(+), 217 deletions(-) delete mode 100644 gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNotarizationStatusTask.kt delete mode 100644 gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractUploadAppForNotarizationTask.kt create mode 100644 tutorials/Signing_and_notarization_on_macOS/notarization-team-id.png diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/MacOSNotarizationSettings.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/MacOSNotarizationSettings.kt index 8e98968e813..2d3929ae666 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/MacOSNotarizationSettings.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/dsl/MacOSNotarizationSettings.kt @@ -9,6 +9,7 @@ import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.Property import org.gradle.api.provider.ProviderFactory import org.gradle.api.tasks.Input +import org.gradle.api.tasks.Internal import org.gradle.api.tasks.Optional import org.jetbrains.compose.desktop.application.internal.ComposeProperties import org.jetbrains.compose.internal.utils.nullableProperty @@ -35,7 +36,15 @@ abstract class MacOSNotarizationSettings { @get:Input @get:Optional + val teamID: Property = objects.nullableProperty().apply { + set(ComposeProperties.macNotarizationTeamID(providers)) + } + + @Deprecated("This option is no longer supported and got replaced by teamID", level = DeprecationLevel.ERROR) + @get:Internal val ascProvider: Property = objects.nullableProperty().apply { - set(ComposeProperties.macNotarizationAscProvider(providers)) + set(providers.provider { + throw UnsupportedOperationException("This option is not supported by notary tool and was replaced by teamID") + }) } -} \ No newline at end of file +} diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt index 08123a41254..3c3094495d9 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ComposeProjectProperties.kt @@ -19,7 +19,7 @@ internal object ComposeProperties { internal const val MAC_SIGN_PREFIX = "compose.desktop.mac.signing.prefix" internal const val MAC_NOTARIZATION_APPLE_ID = "compose.desktop.mac.notarization.appleID" internal const val MAC_NOTARIZATION_PASSWORD = "compose.desktop.mac.notarization.password" - internal const val MAC_NOTARIZATION_ASC_PROVIDER = "compose.desktop.mac.notarization.ascProvider" + internal const val MAC_NOTARIZATION_TEAM_ID_PROVIDER = "compose.desktop.mac.notarization.teamID" internal const val CHECK_JDK_VENDOR = "compose.desktop.packaging.checkJdkVendor" fun isVerbose(providers: ProviderFactory): Provider = @@ -46,8 +46,8 @@ internal object ComposeProperties { fun macNotarizationPassword(providers: ProviderFactory): Provider = providers.valueOrNull(MAC_NOTARIZATION_PASSWORD) - fun macNotarizationAscProvider(providers: ProviderFactory): Provider = - providers.valueOrNull(MAC_NOTARIZATION_ASC_PROVIDER) + fun macNotarizationTeamID(providers: ProviderFactory): Provider = + providers.valueOrNull(MAC_NOTARIZATION_TEAM_ID_PROVIDER) fun checkJdkVendor(providers: ProviderFactory): Provider = providers.valueOrNull(CHECK_JDK_VENDOR).toBooleanProvider(true) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ExternalToolRunner.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ExternalToolRunner.kt index c8775f9b261..02b242f3a8c 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ExternalToolRunner.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/ExternalToolRunner.kt @@ -11,6 +11,7 @@ import org.gradle.api.provider.Provider import org.gradle.process.ExecOperations import org.gradle.process.ExecResult import org.jetbrains.compose.internal.utils.ioFile +import java.io.ByteArrayInputStream import java.io.File import java.time.LocalDateTime import java.time.format.DateTimeFormatter @@ -33,7 +34,8 @@ internal class ExternalToolRunner( workingDir: File? = null, checkExitCodeIsNormal: Boolean = true, processStdout: Function1? = null, - logToConsole: LogToConsole = LogToConsole.OnlyWhenVerbose + logToConsole: LogToConsole = LogToConsole.OnlyWhenVerbose, + stdinStr: String? = null ): ExecResult { val logsDir = logsDir.ioFile logsDir.mkdirs() @@ -52,6 +54,10 @@ internal class ExternalToolRunner( // check exit value later spec.isIgnoreExitValue = true + if (stdinStr != null) { + spec.standardInput = ByteArrayInputStream(stdinStr.toByteArray()) + } + @Suppress("NAME_SHADOWING") val logToConsole = when (logToConsole) { LogToConsole.Always -> true diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureJvmApplication.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureJvmApplication.kt index 83707cf8b51..5983ab90fe7 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureJvmApplication.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/configureJvmApplication.kt @@ -186,23 +186,13 @@ private fun JvmApplicationContext.configurePackagingTasks( "Unexpected target format for MacOS: $targetFormat" } - val notarizationRequestsDir = project.layout.buildDirectory.dir("compose/notarization/$app") - tasks.register( + tasks.register( taskNameAction = "notarize", taskNameObject = targetFormat.name, args = listOf(targetFormat) ) { dependsOn(packageFormat) inputDir.set(packageFormat.flatMap { it.destinationDir }) - requestsDir.set(notarizationRequestsDir) - configureCommonNotarizationSettings(this) - } - - tasks.register( - taskNameAction = "check", - taskNameObject = "notarizationStatus" - ) { - requestDir.set(notarizationRequestsDir) configureCommonNotarizationSettings(this) } } @@ -351,7 +341,6 @@ private fun JvmApplicationContext.configurePackageTask( internal fun JvmApplicationContext.configureCommonNotarizationSettings( notarizationTask: AbstractNotarizationTask ) { - notarizationTask.nonValidatedBundleID.set(app.nativeDistributions.macOS.bundleID) notarizationTask.nonValidatedNotarizationSettings = app.nativeDistributions.macOS.notarization } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt index 501fb162f28..cc635b6b950 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt @@ -5,25 +5,20 @@ package org.jetbrains.compose.desktop.application.internal.validation -import org.gradle.api.provider.Provider import org.jetbrains.compose.desktop.application.dsl.MacOSNotarizationSettings import org.jetbrains.compose.desktop.application.internal.ComposeProperties internal data class ValidatedMacOSNotarizationSettings( - val bundleID: String, val appleID: String, val password: String, - val ascProvider: String? + val teamID: String? ) -internal fun MacOSNotarizationSettings?.validate( - bundleIDProvider: Provider -): ValidatedMacOSNotarizationSettings { +internal fun MacOSNotarizationSettings?.validate(): ValidatedMacOSNotarizationSettings { checkNotNull(this) { ERR_NOTARIZATION_SETTINGS_ARE_NOT_PROVIDED } - val bundleID = validateBundleID(bundleIDProvider) check(!appleID.orNull.isNullOrEmpty()) { ERR_APPLE_ID_IS_EMPTY } @@ -31,10 +26,9 @@ internal fun MacOSNotarizationSettings?.validate( ERR_PASSWORD_IS_EMPTY } return ValidatedMacOSNotarizationSettings( - bundleID = bundleID, appleID = appleID.orNull!!, password = password.orNull!!, - ascProvider = ascProvider.orNull + teamID = teamID.orNull ) } @@ -50,4 +44,4 @@ private val ERR_PASSWORD_IS_EMPTY = """|$ERR_PREFIX password is null or empty. To specify: | * Use '${ComposeProperties.MAC_NOTARIZATION_PASSWORD}' Gradle property; | * Or use 'nativeDistributions.macOS.notarization.password' DSL property; - """.trimMargin() \ No newline at end of file + """.trimMargin() diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNotarizationStatusTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNotarizationStatusTask.kt deleted file mode 100644 index 1e19b9a1be6..00000000000 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractCheckNotarizationStatusTask.kt +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright 2020-2021 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 org.jetbrains.compose.desktop.application.tasks - -import org.gradle.api.file.DirectoryProperty -import org.gradle.api.tasks.* -import org.jetbrains.compose.desktop.application.internal.ExternalToolRunner -import org.jetbrains.compose.internal.utils.MacUtils -import org.jetbrains.compose.desktop.application.internal.NOTARIZATION_REQUEST_INFO_FILE_NAME -import org.jetbrains.compose.desktop.application.internal.NotarizationRequestInfo -import org.jetbrains.compose.internal.utils.ioFile - -abstract class AbstractCheckNotarizationStatusTask : AbstractNotarizationTask() { - @get:Internal - val requestDir: DirectoryProperty = objects.directoryProperty() - - @TaskAction - fun run() { - val notarization = validateNotarization() - - val requests = HashSet() - for (file in requestDir.ioFile.walk()) { - if (file.isFile && file.name == NOTARIZATION_REQUEST_INFO_FILE_NAME) { - try { - val status = NotarizationRequestInfo() - status.loadFrom(file) - requests.add(status) - } catch (e: Exception) { - logger.error("Invalid notarization request status file: $file", e) - } - } - } - - if (requests.isEmpty()) { - logger.quiet("No existing notarization requests") - return - } - - for (request in requests.sortedBy { it.uploadTime }) { - try { - logger.quiet("Checking status of notarization request '${request.uuid}'") - runExternalTool( - tool = MacUtils.xcrun, - args = listOf( - "altool", - "--notarization-info", request.uuid, - "--username", notarization.appleID, - "--password", notarization.password - ), - logToConsole = ExternalToolRunner.LogToConsole.Always - ) - } catch (e: Exception) { - logger.error("Could not check notarization request '${request.uuid}'", e) - } - } - } -} \ No newline at end of file diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt index 4efbadacdd6..ae2a1b6653d 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt @@ -5,24 +5,67 @@ package org.jetbrains.compose.desktop.application.tasks -import org.gradle.api.provider.Property -import org.gradle.api.tasks.Input -import org.gradle.api.tasks.Nested -import org.gradle.api.tasks.Optional +import org.gradle.api.file.DirectoryProperty +import org.gradle.api.tasks.* import org.jetbrains.compose.desktop.application.dsl.MacOSNotarizationSettings -import org.jetbrains.compose.internal.utils.nullableProperty +import org.jetbrains.compose.desktop.application.dsl.TargetFormat +import org.jetbrains.compose.desktop.application.internal.files.checkExistingFile +import org.jetbrains.compose.desktop.application.internal.files.findOutputFileOrDir +import org.jetbrains.compose.desktop.application.internal.validation.ValidatedMacOSNotarizationSettings import org.jetbrains.compose.desktop.application.internal.validation.validate import org.jetbrains.compose.desktop.tasks.AbstractComposeDesktopTask +import org.jetbrains.compose.internal.utils.MacUtils +import org.jetbrains.compose.internal.utils.ioFile +import java.io.File +import javax.inject.Inject -abstract class AbstractNotarizationTask : AbstractComposeDesktopTask() { +abstract class AbstractNotarizationTask @Inject constructor( @get:Input - @get:Optional - internal val nonValidatedBundleID: Property = objects.nullableProperty() + val targetFormat: TargetFormat +) : AbstractComposeDesktopTask() { @get:Nested @get:Optional internal var nonValidatedNotarizationSettings: MacOSNotarizationSettings? = null - internal fun validateNotarization() = - nonValidatedNotarizationSettings.validate(nonValidatedBundleID) -} \ No newline at end of file + @get:InputDirectory + val inputDir: DirectoryProperty = objects.directoryProperty() + + init { + check(targetFormat != TargetFormat.AppImage) { "${TargetFormat.AppImage} cannot be notarized!" } + } + + @TaskAction + fun run() { + val notarization = nonValidatedNotarizationSettings.validate() + val packageFile = findOutputFileOrDir(inputDir.ioFile, targetFormat).checkExistingFile() + + notarize(notarization, packageFile) + staple(packageFile) + } + + private fun notarize( + notarization: ValidatedMacOSNotarizationSettings, + packageFile: File + ) { + logger.info("Uploading '${packageFile.name}' for notarization") + val args = listOfNotNull( + "notarytool", + "submit", + "--wait", + "--apple-id", + notarization.appleID, + "--team-id".takeIf { notarization.teamID != null }, + notarization.teamID, + packageFile.absolutePath + ) + runExternalTool(tool = MacUtils.xcrun, args = args, stdinStr = notarization.password) + } + + private fun staple(packageFile: File) { + runExternalTool( + tool = MacUtils.xcrun, + args = listOf("stapler", "staple", packageFile.absolutePath) + ) + } +} diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractUploadAppForNotarizationTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractUploadAppForNotarizationTask.kt deleted file mode 100644 index ebc5e22a4fd..00000000000 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractUploadAppForNotarizationTask.kt +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright 2020-2021 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 org.jetbrains.compose.desktop.application.tasks - -import org.gradle.api.file.DirectoryProperty -import org.gradle.api.tasks.* -import org.jetbrains.compose.desktop.application.dsl.TargetFormat -import org.jetbrains.compose.desktop.application.internal.* -import org.jetbrains.compose.desktop.application.internal.files.checkExistingFile -import org.jetbrains.compose.desktop.application.internal.files.findOutputFileOrDir -import org.jetbrains.compose.internal.utils.MacUtils -import org.jetbrains.compose.internal.utils.ioFile -import java.io.File -import java.time.LocalDateTime -import java.time.format.DateTimeFormatter -import javax.inject.Inject - -abstract class AbstractUploadAppForNotarizationTask @Inject constructor( - @get:Input - val targetFormat: TargetFormat -) : AbstractNotarizationTask() { - @get:InputDirectory - val inputDir: DirectoryProperty = objects.directoryProperty() - - @get:Internal - val requestsDir: DirectoryProperty = objects.directoryProperty() - - init { - check(targetFormat != TargetFormat.AppImage) { "${TargetFormat.AppImage} cannot be notarized!" } - } - - @TaskAction - fun run() { - val notarization = validateNotarization() - val packageFile = findOutputFileOrDir(inputDir.ioFile, targetFormat).checkExistingFile() - - logger.quiet("Uploading '${packageFile.name}' for notarization (package id: '${notarization.bundleID}')") - val args = arrayListOf( - "altool", - "--notarize-app", - "--primary-bundle-id", notarization.bundleID, - "--username", notarization.appleID, - "--password", notarization.password, - "--file", packageFile.absolutePath - ) - if (notarization.ascProvider != null) { - args.add("--asc-provider") - args.add(notarization.ascProvider) - } - - runExternalTool( - tool = MacUtils.xcrun, - args = args, - processStdout = { output -> - processUploadToolOutput(packageFile, output) - } - ) - } - - private fun processUploadToolOutput(packageFile: File, output: String) { - val m = "RequestUUID = ([A-Za-z0-9\\-]+)".toRegex().find(output) - ?: error("Could not determine RequestUUID from output: $output") - - val requestId = m.groupValues[1] - - val uploadTime = LocalDateTime.now() - .format(DateTimeFormatter.ofPattern("yyyy-MM-dd-HH-mm-ss")) - val requestDir = requestsDir.ioFile.resolve("$uploadTime-${targetFormat.id}") - val packageCopy = requestDir.resolve(packageFile.name) - packageFile.copyTo(packageCopy) - val requestInfo = NotarizationRequestInfo(uuid = requestId, uploadTime = uploadTime) - val requestInfoFile = requestDir.resolve(NOTARIZATION_REQUEST_INFO_FILE_NAME) - requestInfo.saveTo(requestInfoFile) - - logger.quiet("Request UUID: $requestId") - logger.quiet("Request UUID is saved to ${requestInfoFile.absolutePath}") - logger.quiet("Uploaded file is saved to ${packageCopy.absolutePath}") - } -} diff --git a/tutorials/Signing_and_notarization_on_macOS/README.md b/tutorials/Signing_and_notarization_on_macOS/README.md index 1a34c473e04..d79be326e58 100644 --- a/tutorials/Signing_and_notarization_on_macOS/README.md +++ b/tutorials/Signing_and_notarization_on_macOS/README.md @@ -221,38 +221,58 @@ The following Gradle properties can be used instead of DSL properties: Those properties could be stored in `$HOME/.gradle/gradle.properties` to use across multiple applications. -### Configuring notarization settings +### Notarization -Notarization is only required for apps outside the App Store. +Distributing your macOS application outside the App Store +requires notarization. +Notarization involves submitting your application to Apple for verification. +If your software passes the verification, +it's signed by Apple, stating that it has been notarized. -``` kotlin -macOS { - notarization { - appleID.set("john.doe@example.com") - password.set("@keychain:NOTARIZATION_PASSWORD") - - // optional - ascProvider.set("") - } -} +To notarize your app, you can use `notarize` task: ``` - -* Set `appleID` to your Apple ID. - * Alternatively, the `compose.desktop.mac.notarization.appleID` Gradle property can be used. -* Set `password` to the app-specific password created previously. - * Alternatively, the `compose.desktop.mac.notarization.password` Gradle property can be used. - * Don't write raw password directly into a build script. - * If the password was added to the keychain, as described previously, it can be referenced as - ``` - @keychain:NOTARIZATION_PASSWORD - ``` -* Set `ascProvider` to your Team ID, if your account is associated with multiple teams. - * Alternatively, the `compose.desktop.mac.notarization.ascProvider` Gradle property can be used. - * To get a table of team IDs associated with a given username and password, run: +./gradlew notarizeDmg \ + -Pcompose.desktop.mac.notarization.appleID= \ + -Pcompose.desktop.mac.notarization.password= \ + -Pcompose.desktop.mac.notarization.teamID= +``` +where: +* `` — your Apple ID; +* `` — the app-specific password created previously; +* `` — your Team. To get a table of team IDs associated with a given username and password, run: ``` xcrun altool --list-providers -u -p " ``` +Team ID + + +The following tasks can be used for notarization: +* `notarizeDmg` — build, sign and notarize `.dmg` installer; +* `notarizeReleaseDmg` — same as `notarizeDmg`, but with [ProGuard](tutorials/Native_distributions_and_local_execution/README.md). +* `notarizePkg` — build, sign and notarize `.pkg` installer; +* `notarizeReleasePkg` — same as `notarizePkg`, but with [ProGuard](tutorials/Native_distributions_and_local_execution/README.md). + +The notarization settings can also be set using the DSL. +For example, it is possible to pass credentials using environment variables: +``` +compose.desktop.application { + nativeDistributions { + macOS { + notarization { + val providers = project.providers + appleID.set(providers.environmentVariable("NOTARIZATION_APPLE_ID")) + password.set(providers.environmentVariable("NOTARIZATION_PASSWORD")) + teamId.set(providers.environmentVariable("NOTARIZATION_TEAM_ID")) + } + } + } +} +``` + +According to Apple, for 98 percent of software notarization completes within 15 minutes. +To learn more on how to avoid long response times, check [the official documentation](https://developer.apple.com/documentation/security/notarizing_macos_software_before_distribution/customizing_the_notarization_workflow#3561440). + ### Configuring provisioning profile For testing on TestFlight (when publishing to the App Store), you need to add a provisioning @@ -375,14 +395,3 @@ The following tasks are available: (no separate step is required). * Use `notarize` (e.g. `notarizeDmg`) to upload an application for notarization. Notarization is only required for apps outside the App Store. - Once the upload finishes, a `RequestUUID` will be printed. - The notarization process takes some time. - Once the notarization process finishes, an email will be sent to you. - Uploaded file is saved to `/compose/notarization/main/-` -* Use `checkNotarizationStatus` to check a status of - last notarization requests. You can also use a command-line command to check any notarization request: -``` -xcrun altool --notarization-info - --username - --password "@keychain:NOTARIZATION_PASSWORD" -``` diff --git a/tutorials/Signing_and_notarization_on_macOS/notarization-team-id.png b/tutorials/Signing_and_notarization_on_macOS/notarization-team-id.png new file mode 100644 index 0000000000000000000000000000000000000000..98c81b2e243d2ef9bee1c328b8a437fd798d3e4b GIT binary patch literal 50417 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 O-!+ZvSF$c!1pOa_H;XC& literal 0 HcmV?d00001 From a73909e7eef7610201ac5240170cd7b06848b581 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov <654232+AlexeyTsvetkov@users.noreply.github.com> Date: Tue, 19 Sep 2023 20:01:21 +0300 Subject: [PATCH 09/14] Check that teamID is set (#3708) The parameter is mandatory with notarytool --- .../validation/ValidatedMacOSNotarizationSettings.kt | 12 ++++++++++-- .../application/tasks/AbstractNotarizationTask.kt | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt index cc635b6b950..d31d578aa76 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/internal/validation/ValidatedMacOSNotarizationSettings.kt @@ -11,7 +11,7 @@ import org.jetbrains.compose.desktop.application.internal.ComposeProperties internal data class ValidatedMacOSNotarizationSettings( val appleID: String, val password: String, - val teamID: String? + val teamID: String ) internal fun MacOSNotarizationSettings?.validate(): ValidatedMacOSNotarizationSettings { @@ -25,10 +25,13 @@ internal fun MacOSNotarizationSettings?.validate(): ValidatedMacOSNotarizationSe check(!password.orNull.isNullOrEmpty()) { ERR_PASSWORD_IS_EMPTY } + check(!teamID.orNull.isNullOrEmpty()) { + TEAM_ID_IS_EMPTY + } return ValidatedMacOSNotarizationSettings( appleID = appleID.orNull!!, password = password.orNull!!, - teamID = teamID.orNull + teamID = teamID.orNull!! ) } @@ -45,3 +48,8 @@ private val ERR_PASSWORD_IS_EMPTY = | * Use '${ComposeProperties.MAC_NOTARIZATION_PASSWORD}' Gradle property; | * Or use 'nativeDistributions.macOS.notarization.password' DSL property; """.trimMargin() +private val TEAM_ID_IS_EMPTY = + """|$ERR_PREFIX teamID is null or empty. To specify: + | * Use '${ComposeProperties.MAC_NOTARIZATION_TEAM_ID_PROVIDER}' Gradle property; + | * Or use 'nativeDistributions.macOS.notarization.teamID' DSL property; + """.trimMargin() diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt index ae2a1b6653d..2d52106fc74 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/desktop/application/tasks/AbstractNotarizationTask.kt @@ -55,7 +55,7 @@ abstract class AbstractNotarizationTask @Inject constructor( "--wait", "--apple-id", notarization.appleID, - "--team-id".takeIf { notarization.teamID != null }, + "--team-id", notarization.teamID, packageFile.absolutePath ) From 40543117a303fc5d5239c20cf336ddc0139c511e Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Fri, 22 Sep 2023 12:19:02 +0200 Subject: [PATCH 10/14] Add more targets to SUPPORTED_NATIVE_TARGETS (#3669) Update according to our k/n targets of compose.runtime --- .../internal/configureNativeCompilerCaching.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt index 99a9efbd0cb..49a0b2317c0 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureNativeCompilerCaching.kt @@ -19,13 +19,31 @@ private const val PROJECT_CACHE_KIND_PROPERTY_NAME = "kotlin.native.cacheKind" private const val COMPOSE_NATIVE_MANAGE_CACHE_KIND = "compose.kotlin.native.manageCacheKind" private const val NONE_VALUE = "none" +// Compose runtime supports these k/native targets: +// https://github.com/JetBrains/compose-multiplatform-core/blob/jb-main/compose/runtime/runtime/build.gradle#L75 private val SUPPORTED_NATIVE_TARGETS = setOf( + // ios KonanTarget.IOS_ARM32, KonanTarget.IOS_X64, KonanTarget.IOS_ARM64, KonanTarget.IOS_SIMULATOR_ARM64, + // macos KonanTarget.MACOS_X64, KonanTarget.MACOS_ARM64, + // tvos + KonanTarget.TVOS_X64, + KonanTarget.TVOS_ARM64, + KonanTarget.TVOS_SIMULATOR_ARM64, + // watchOS + KonanTarget.WATCHOS_ARM64, + KonanTarget.WATCHOS_ARM32, + KonanTarget.WATCHOS_X64, + KonanTarget.WATCHOS_X86, // it's going to be deprecated, see comments in KonanTarget + KonanTarget.WATCHOS_SIMULATOR_ARM64, + // mingw + KonanTarget.MINGW_X64, + // linux + KonanTarget.LINUX_X64, ) internal val SUPPORTED_NATIVE_CACHE_KIND_PROPERTIES = From 393cfdd6638eee465b3c974fe9e6b3b0a1db57c1 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Fri, 22 Sep 2023 15:37:55 +0200 Subject: [PATCH 11/14] Support kotlin 1.9.20-Beta2 (#3721) --- .../org/jetbrains/compose/ComposeCompilerCompatibility.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt index 3519d72728f..9ef6c357d9b 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerCompatibility.kt @@ -16,7 +16,8 @@ internal object ComposeCompilerCompatibility { "1.9.0-RC" to "1.4.8-beta", "1.9.0" to "1.5.1", "1.9.10" to "1.5.2", - "1.9.20-Beta" to "1.5.2.1-Beta2" + "1.9.20-Beta" to "1.5.2.1-Beta2", + "1.9.20-Beta2" to "1.5.2.1-Beta3" ) fun compilerVersionFor(kotlinVersion: String): String { From 759fa30a0b4fc9ca59c8e2448994c0768522422a Mon Sep 17 00:00:00 2001 From: Nikolai Rykunov Date: Mon, 25 Sep 2023 19:57:48 +0200 Subject: [PATCH 12/14] Update CHANGELOG.md for 1.5.2 (#3726) --- CHANGELOG.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a9410c31d..22593eba1a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +# 1.5.2 (September 2023) + +## Desktop + +### Fixes +- [Application crash on touch (using touchscreen) when onClick modifier is used](https://github.com/JetBrains/compose-multiplatform/issues/3655) + +## Dependencies + +This version of Compose Multiplatform is based on the next Jetpack Compose libraries: + +- [Compiler 1.5.3](https://developer.android.com/jetpack/androidx/releases/compose-compiler#1.5.3) +- [Runtime 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-runtime#1.5.0) +- [UI 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-ui#1.5.0) +- [Foundation 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-foundation#1.5.0) +- [Material 1.5.0](https://developer.android.com/jetpack/androidx/releases/compose-material#1.5.0) +- [Material3 1.1.1](https://developer.android.com/jetpack/androidx/releases/compose-material3#1.1.1) + + # 1.5.10-beta01 (September 2023) ## Common From 5ad17128f8f9d16c5d9a69568f7f11e39cf7e816 Mon Sep 17 00:00:00 2001 From: Oleksandr Karpovich Date: Tue, 26 Sep 2023 10:01:23 +0200 Subject: [PATCH 13/14] Add API to not apply the Compose Compiler plugin (#3722) * Add API to not apply the Compose Compiler plugin * avoid eager initialization * Update gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt Co-authored-by: Igor Demin * Update gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt Co-authored-by: Igor Demin * Apply PR review suggestions: - Deprecate `compose.web.targets` in favor of `compose.platformTypes` - refactor `configureExperimentalWebApplication` to support multiple k/js targets --------- Co-authored-by: Igor Demin --- .../ComposeCompilerKotlinSupportPlugin.kt | 19 +++++---- .../org/jetbrains/compose/ComposeExtension.kt | 14 +++++++ .../internal/configureExperimental.kt | 5 +-- .../configureExperimentalWebApplication.kt | 39 +++++++++++-------- .../org/jetbrains/compose/web/WebExtension.kt | 16 +++----- 5 files changed, 55 insertions(+), 38 deletions(-) diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt index 996590487c4..72cf5c78b25 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeCompilerKotlinSupportPlugin.kt @@ -16,6 +16,8 @@ import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget class ComposeCompilerKotlinSupportPlugin : KotlinCompilerPluginSupportPlugin { private lateinit var composeCompilerArtifactProvider: ComposeCompilerArtifactProvider + private lateinit var applicableForPlatformTypes: Provider> + override fun apply(target: Project) { super.apply(target) @@ -27,6 +29,8 @@ class ComposeCompilerKotlinSupportPlugin : KotlinCompilerPluginSupportPlugin { ComposeCompilerCompatibility.compilerVersionFor(target.getKotlinPluginVersion()) } + applicableForPlatformTypes = composeExt.platformTypes + collectUnsupportedCompilerPluginUsages(target) } } @@ -62,15 +66,14 @@ class ComposeCompilerKotlinSupportPlugin : KotlinCompilerPluginSupportPlugin { override fun getPluginArtifactForNative(): SubpluginArtifact = composeCompilerArtifactProvider.compilerHostedArtifact - override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean = - when (kotlinCompilation.target.platformType) { - KotlinPlatformType.common -> true - KotlinPlatformType.jvm -> true - KotlinPlatformType.js -> isApplicableJsTarget(kotlinCompilation.target) - KotlinPlatformType.androidJvm -> true - KotlinPlatformType.native -> true - KotlinPlatformType.wasm -> false + override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean { + val applicableTo = applicableForPlatformTypes.get() + + return when (val type = kotlinCompilation.target.platformType) { + KotlinPlatformType.js -> isApplicableJsTarget(kotlinCompilation.target) && applicableTo.contains(type) + else -> applicableTo.contains(type) } + } private fun isApplicableJsTarget(kotlinTarget: KotlinTarget): Boolean { if (kotlinTarget !is KotlinJsIrTarget) return false diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt index e16b8e7677c..ee3c0a52cfc 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/ComposeExtension.kt @@ -10,7 +10,9 @@ import org.gradle.api.model.ObjectFactory import org.gradle.api.plugins.ExtensionAware import org.gradle.api.provider.ListProperty import org.gradle.api.provider.Property +import org.gradle.api.provider.SetProperty import org.jetbrains.compose.internal.utils.nullableProperty +import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType import javax.inject.Inject abstract class ComposeExtension @Inject constructor( @@ -41,5 +43,17 @@ abstract class ComposeExtension @Inject constructor( */ val kotlinCompilerPluginArgs: ListProperty = objects.listProperty(String::class.java) + /** + * A set of kotlin platform types to which the Compose plugin will be applied. + * By default, it contains all KotlinPlatformType values. + * It can be used to disable the Compose plugin for one or more targets: + * ``` + * platformTypes.set(platformTypes.get() - KotlinPlatformType.native) + * ``` + */ + val platformTypes: SetProperty = objects.setProperty(KotlinPlatformType::class.java).apply { + set(KotlinPlatformType.values().toMutableSet()) + } + val dependencies = ComposePlugin.Dependencies(project) } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt index bb3f480fb96..ae6b6e55677 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/internal/configureExperimental.kt @@ -25,8 +25,7 @@ internal fun Project.configureExperimental( if (experimentalExt.web._isApplicationInitialized) { val webExt = composeExt.extensions.getByType(WebExtension::class.java) - for (target in webExt.targetsToConfigure(project)) { - target.configureExperimentalWebApplication(experimentalExt.web.application) - } + webExt.targetsToConfigure(project) + .configureExperimentalWebApplication(project, experimentalExt.web.application) } } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt index fd82075cc75..bf262212538 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/experimental/web/internal/configureExperimentalWebApplication.kt @@ -18,25 +18,30 @@ import org.jetbrains.compose.internal.utils.registerTask import org.jetbrains.compose.internal.utils.uppercaseFirstChar import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget -internal fun KotlinJsIrTarget.configureExperimentalWebApplication(app: ExperimentalWebApplication) { - val mainCompilation = compilations.getByName("main") - val unpackedRuntimeDir = project.layout.buildDirectory.dir("compose/skiko-wasm/$targetName") - val taskName = "unpackSkikoWasmRuntime${targetName.uppercaseFirstChar()}" - mainCompilation.defaultSourceSet.resources.srcDir(unpackedRuntimeDir) - - val skikoJsWasmRuntimeDependency = skikoVersionProvider(project) - .map { skikoVersion -> - project.dependencies.create("org.jetbrains.skiko:skiko-js-wasm-runtime:$skikoVersion") - } - val skikoJsWasmRuntimeConfiguration = project.configurations.create("COMPOSE_SKIKO_JS_WASM_RUNTIME").defaultDependencies { - it.addLater(skikoJsWasmRuntimeDependency) +internal fun Collection.configureExperimentalWebApplication( + project: Project, + app: ExperimentalWebApplication +) { + val skikoJsWasmRuntimeConfiguration = project.configurations.create("COMPOSE_SKIKO_JS_WASM_RUNTIME") + val skikoJsWasmRuntimeDependency = skikoVersionProvider(project).map { skikoVersion -> + project.dependencies.create("org.jetbrains.skiko:skiko-js-wasm-runtime:$skikoVersion") } - val unpackRuntime = project.registerTask(taskName) { - skikoRuntimeFiles = skikoJsWasmRuntimeConfiguration - outputDir.set(unpackedRuntimeDir) + skikoJsWasmRuntimeConfiguration.defaultDependencies { + it.addLater(skikoJsWasmRuntimeDependency) } - project.tasks.named(mainCompilation.processResourcesTaskName).configure { processResourcesTask -> - processResourcesTask.dependsOn(unpackRuntime) + forEach { + val mainCompilation = it.compilations.getByName("main") + val unpackedRuntimeDir = project.layout.buildDirectory.dir("compose/skiko-wasm/${it.targetName}") + val taskName = "unpackSkikoWasmRuntime${it.targetName.uppercaseFirstChar()}" + mainCompilation.defaultSourceSet.resources.srcDir(unpackedRuntimeDir) + + val unpackRuntime = project.registerTask(taskName) { + skikoRuntimeFiles = skikoJsWasmRuntimeConfiguration + outputDir.set(unpackedRuntimeDir) + } + project.tasks.named(mainCompilation.processResourcesTaskName).configure { processResourcesTask -> + processResourcesTask.dependsOn(unpackRuntime) + } } } diff --git a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/WebExtension.kt b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/WebExtension.kt index 571a2792ce1..3f3110980ef 100644 --- a/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/WebExtension.kt +++ b/gradle-plugins/compose/src/main/kotlin/org/jetbrains/compose/web/WebExtension.kt @@ -20,6 +20,10 @@ abstract class WebExtension : ExtensionAware { // public api @Suppress("unused") + @Deprecated( + """By default, Compose is applied to all declared K/JS-IR targets. + If you need to not apply Compose for K/JS, please exclude `KotlinPlatformType.js` from `compose.platformTypes`""" + ) fun targets(vararg targets: KotlinTarget) { check(requestedTargets == null) { "compose.web.targets() was already set!" @@ -53,20 +57,12 @@ abstract class WebExtension : ExtensionAware { if (mppExt != null) { val mppTargets = mppExt.targets.asMap.values val jsIRTargets = mppTargets.filterIsInstanceTo(LinkedHashSet()) - - return if (jsIRTargets.size > 1) { - project.logger.error( - "w: Default configuration for Compose for Web is disabled: " + - "multiple Kotlin JS IR targets are defined. " + - "Specify Compose for Web Kotlin targets by using `compose.web.targets()`" - ) - emptySet() - } else jsIRTargets + return jsIRTargets } val jsExt = project.kotlinJsExtOrNull if (jsExt != null) { - val target = jsExt.target + val target = jsExt.js() return if (target is KotlinJsIrTarget) { setOf(target) } else { From 1f70741dcf51f07a9512a18256f3baacdf293e19 Mon Sep 17 00:00:00 2001 From: Philip Wedemann <22521688+hfhbd@users.noreply.github.com> Date: Tue, 26 Sep 2023 10:32:27 +0200 Subject: [PATCH 14/14] Html: SVG - Add fillOpacity attribute (#3725) * Html: SVG - Add fillOpacity attribute * Add typed overloads * Use normal number * Update svgAttrs.kt * Remove public marker --- .../kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt b/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt index 4d0d74ac574..d92d0e0f3e0 100644 --- a/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt +++ b/html/svg/src/jsMain/kotlin/org/jetbrains/compose/web/svg/svgAttrs.kt @@ -41,6 +41,14 @@ fun AttrsScope.fillRule(fill: String) { attr("fill-rule", fill) } +fun AttrsScope.fillOpacity(fill: Number) { + attr("fill-opacity", fill.toString()) +} + +fun AttrsScope.fillOpacity(fill: CSSPercentageValue) { + attr("fill-opacity", fill.toString()) +} + fun AttrsScope.href(href: String) { attr("href", href) }