diff --git a/.github/workflows/compilation-check.yml b/.github/workflows/compilation-check.yml index 8d04602..d1b1b48 100644 --- a/.github/workflows/compilation-check.yml +++ b/.github/workflows/compilation-check.yml @@ -14,10 +14,10 @@ jobs: os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v1 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Check build run: ./gradlew detektWithoutTests build publishToMavenLocal - name: Install pods diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 37d1d14..f0cfe9e 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -22,10 +22,10 @@ jobs: os: [macos-latest, windows-latest, ubuntu-latest] steps: - uses: actions/checkout@v1 - - name: Set up JDK 11 + - name: Set up JDK 17 uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Publish run: ./gradlew publish -DIS_MAIN_HOST=${{ matrix.os == 'ubuntu-latest' }} release: diff --git a/.gitignore b/.gitignore index 2441fad..05ef5f8 100755 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ Pods xcuserdata local.properties local.gradle -kotlin-js-store/ \ No newline at end of file +kotlin-js-store/ +.kotlin \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index 22a3788..e5e92d1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,3 +1,6 @@ +import org.jetbrains.kotlin.gradle.dsl.JvmTarget +import org.jetbrains.kotlin.gradle.tasks.KotlinCompile + /* * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license. */ @@ -17,9 +20,7 @@ allprojects { group = "dev.icerock.moko" version = libs.versions.mokoGraphicsVersion.get() } -} - -// temporary fix for Apple Silicon (remove after 1.6.20 update) -rootProject.plugins.withType { - rootProject.the().nodeVersion = "16.0.0" + tasks.withType { + compilerOptions.jvmTarget = JvmTarget.JVM_1_8 + } } diff --git a/gradle.properties b/gradle.properties index ab84add..3fc808a 100755 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,6 @@ org.gradle.parallel=true kotlin.code.style=official kotlin.mpp.stability.nowarn=true -kotlin.mpp.enableGranularSourceSetsMetadata=true -kotlin.mpp.enableCompatibilityMetadataVariant=true -kotlin.native.enableDependencyPropagation=false +kotlin.js.yarn=false android.useAndroidX=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ff5defc..74fba13 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,10 +1,10 @@ [versions] -androidAppCompatVersion = "1.2.0" -androidAnnotationVersion = "1.1.0" -mokoGraphicsVersion = "0.9.0" +androidAppCompatVersion = "1.6.1" +androidAnnotationVersion = "1.8.0" +mokoGraphicsVersion = "0.10.0" [libraries] appCompat = { module = "androidx.appcompat:appcompat", version.ref = "androidAppCompatVersion" } -annotation = { module = "androidx.annotation:annotation", version.ref = "androidAppCompatVersion" } +annotation = { module = "androidx.annotation:annotation", version.ref = "androidAnnotationVersion" } mokoGraphics = { module = "dev.icerock.moko:graphics", version.ref = "mokoGraphicsVersion" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..7454180 100755 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..48c0a02 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,67 +17,101 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -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 +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + 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 @@ -106,80 +140,95 @@ 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 +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# 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 +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "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 +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - 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\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - 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; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# -# 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" +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 107acd3..ac1b06f 100755 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,89 +1,89 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/graphics-build-logic/build.gradle.kts b/graphics-build-logic/build.gradle.kts index e8b30b4..8081d65 100644 --- a/graphics-build-logic/build.gradle.kts +++ b/graphics-build-logic/build.gradle.kts @@ -10,8 +10,8 @@ repositories { } dependencies { - api("dev.icerock:mobile-multiplatform:0.13.0") - api("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10") - api("com.android.tools.build:gradle:7.0.4") - api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.19.0") + api("dev.icerock:mobile-multiplatform:0.14.2") + api("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0") + api("com.android.tools.build:gradle:8.2.2") + api("io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.6") } diff --git a/graphics-build-logic/settings.gradle.kts b/graphics-build-logic/settings.gradle.kts new file mode 100644 index 0000000..994ca85 --- /dev/null +++ b/graphics-build-logic/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "graphics-build-logic" diff --git a/graphics-build-logic/src/main/kotlin/android-app-convention.gradle.kts b/graphics-build-logic/src/main/kotlin/android-app-convention.gradle.kts index 5a69dab..2eccea7 100644 --- a/graphics-build-logic/src/main/kotlin/android-app-convention.gradle.kts +++ b/graphics-build-logic/src/main/kotlin/android-app-convention.gradle.kts @@ -20,7 +20,7 @@ android { } } - packagingOptions { + packaging { resources.excludes.add("META-INF/*.kotlin_module") resources.excludes.add("META-INF/AL2.0") resources.excludes.add("META-INF/LGPL2.1") diff --git a/graphics-build-logic/src/main/kotlin/android-base-convention.gradle.kts b/graphics-build-logic/src/main/kotlin/android-base-convention.gradle.kts index 7f67285..472c0f3 100644 --- a/graphics-build-logic/src/main/kotlin/android-base-convention.gradle.kts +++ b/graphics-build-logic/src/main/kotlin/android-base-convention.gradle.kts @@ -5,10 +5,10 @@ import com.android.build.gradle.BaseExtension configure { - compileSdkVersion(30) + compileSdkVersion(34) defaultConfig { - minSdkVersion(16) - targetSdkVersion(30) + minSdk = 16 + targetSdk = 34 } } diff --git a/graphics-build-logic/src/main/kotlin/detekt-convention.gradle.kts b/graphics-build-logic/src/main/kotlin/detekt-convention.gradle.kts index 7d7c654..bd7cc6a 100644 --- a/graphics-build-logic/src/main/kotlin/detekt-convention.gradle.kts +++ b/graphics-build-logic/src/main/kotlin/detekt-convention.gradle.kts @@ -14,5 +14,5 @@ tasks.register("detektWithoutTests") { } dependencies { - "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.19.0") + "detektPlugins"("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0") } diff --git a/graphics-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts b/graphics-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts index 8598940..c24c34b 100644 --- a/graphics-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts +++ b/graphics-build-logic/src/main/kotlin/multiplatform-library-convention.gradle.kts @@ -1,3 +1,5 @@ +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl + /* * Copyright 2021 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license. */ @@ -10,52 +12,33 @@ plugins { } kotlin { - android { + androidTarget { publishLibraryVariants("release", "debug") } - ios() + iosX64() + iosArm64() iosSimulatorArm64() macosX64() macosArm64() - tvos() + tvosX64() + tvosArm64() tvosSimulatorArm64() - watchos() + watchosX64() + watchosArm32() + watchosArm64() watchosSimulatorArm64() jvm() - js(BOTH) { + js(IR) { nodejs() browser() } - linux() - windows() - wasm32() - - sourceSets { - val commonMain by getting - - val iosMain by getting - val iosSimulatorArm64Main by getting - iosSimulatorArm64Main.dependsOn(iosMain) - - val macosMain by creating - macosMain.dependsOn(commonMain) - - val macosX64Main by getting - val macosArm64Main by getting - macosX64Main.dependsOn(macosMain) - macosArm64Main.dependsOn(macosMain) - } -} - -fun org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension.linux() { linuxArm64() - linuxArm32Hfp() - linuxMips32() - linuxMipsel32() linuxX64() -} - -fun org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension.windows() { mingwX64() - mingwX86() -} + @OptIn(ExperimentalWasmDsl::class) + wasmJs { + nodejs() + browser() + } + applyDefaultHierarchyTemplate() +} \ No newline at end of file diff --git a/graphics/build.gradle.kts b/graphics/build.gradle.kts index c0606c4..5a7ae6b 100644 --- a/graphics/build.gradle.kts +++ b/graphics/build.gradle.kts @@ -15,3 +15,7 @@ version = libs.versions.mokoGraphicsVersion.get() dependencies { androidMainImplementation(libs.annotation) } + +android { + namespace = "dev.icerock.moko.graphics" +} diff --git a/graphics/src/androidMain/AndroidManifest.xml b/graphics/src/androidMain/AndroidManifest.xml deleted file mode 100755 index 90ce925..0000000 --- a/graphics/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/ColorHEX.kt b/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/ColorHEX.kt index 58aefb3..0487719 100644 --- a/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/ColorHEX.kt +++ b/graphics/src/commonMain/kotlin/dev/icerock/moko/graphics/ColorHEX.kt @@ -6,13 +6,15 @@ package dev.icerock.moko.graphics @Suppress("MagicNumber") fun Color.Companion.parseColor(colorHEX: String): Color { - if (colorHEX[0] != '#') throw IllegalArgumentException("Unknown color") + require(colorHEX[0] != '#') { "Unknown color" } + var colorARGB = colorHEX.substring(1).toLong(16) if (colorHEX.length == 7) { colorARGB = colorARGB or 0x00000000ff000000 - } else if (colorHEX.length != 9) { - throw IllegalArgumentException("Unknown color") + } else { + require(colorHEX.length != 9) { "Unknown color" } } + return Color( alpha = (colorARGB.shr(24) and 0xFF).toInt(), red = (colorARGB.shr(16) and 0xFF).toInt(), diff --git a/graphics/src/iosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt b/graphics/src/iosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt index 03ec951..fb7bae8 100644 --- a/graphics/src/iosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt +++ b/graphics/src/iosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt @@ -6,9 +6,10 @@ package dev.icerock.moko.graphics import platform.UIKit.UIColor -@Suppress("unused") // Used in iOS targets +@Suppress("unused") fun Color.toUIColor(): UIColor { + @Suppress("MagicNumber") val maxColorValue = 0xFF return UIColor( red = red.toDouble() / maxColorValue, diff --git a/graphics/src/macosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt b/graphics/src/macosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt index c835889..faec826 100644 --- a/graphics/src/macosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt +++ b/graphics/src/macosMain/kotlin/dev/icerock/moko/graphics/ColorExt.kt @@ -2,9 +2,10 @@ package dev.icerock.moko.graphics import platform.AppKit.NSColor -@Suppress("unused") // Used in macOS targets +@Suppress("unused") fun Color.toNSColor(): NSColor { + @Suppress("MagicNumber") val maxColorValue = 0xFF return NSColor.colorWithCalibratedRed( red = red.toDouble() / maxColorValue, @@ -12,4 +13,4 @@ fun Color.toNSColor(): NSColor { blue = blue.toDouble() / maxColorValue, alpha = alpha.toDouble() / maxColorValue ) -} \ No newline at end of file +} diff --git a/sample/android-app/build.gradle.kts b/sample/android-app/build.gradle.kts index 5e4be9a..9f92fe2 100644 --- a/sample/android-app/build.gradle.kts +++ b/sample/android-app/build.gradle.kts @@ -8,6 +8,7 @@ plugins { } android { + namespace = "com.icerockdev" defaultConfig { applicationId = "dev.icerock.moko.samples.graphics" diff --git a/sample/android-app/src/main/AndroidManifest.xml b/sample/android-app/src/main/AndroidManifest.xml index 1523029..b02f8c7 100755 --- a/sample/android-app/src/main/AndroidManifest.xml +++ b/sample/android-app/src/main/AndroidManifest.xml @@ -1,19 +1,18 @@ + xmlns:tools="http://schemas.android.com/tools"> - + + android:label="moko-graphics test app" + android:theme="@style/Theme.AppCompat.DayNight" + tools:ignore="GoogleAppIndexingWarning"> - + - - + + diff --git a/sample/mpp-library/build.gradle.kts b/sample/mpp-library/build.gradle.kts index 2c142c8..5634658 100644 --- a/sample/mpp-library/build.gradle.kts +++ b/sample/mpp-library/build.gradle.kts @@ -12,8 +12,9 @@ plugins { } kotlin { - android() - ios() + androidTarget() + iosX64() + iosArm64() iosSimulatorArm64() macosX64() macosArm64() @@ -28,3 +29,7 @@ dependencies { commonMainApi(projects.graphics) } +android { + namespace = "com.icerockdev.library" +} + diff --git a/sample/mpp-library/src/androidMain/AndroidManifest.xml b/sample/mpp-library/src/androidMain/AndroidManifest.xml deleted file mode 100755 index 8f69414..0000000 --- a/sample/mpp-library/src/androidMain/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/settings.gradle.kts b/settings.gradle.kts index 527ec2d..2073ed1 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -2,7 +2,6 @@ * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license. */ -enableFeaturePreview("VERSION_CATALOGS") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") dependencyResolutionManagement { @@ -12,6 +11,8 @@ dependencyResolutionManagement { } } +rootProject.name = "moko-graphics" + includeBuild("graphics-build-logic") include(":graphics")