diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index ec18432..6b91e6e 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -18,7 +18,7 @@ jobs: - name: "Setup Java" uses: actions/setup-java@v1 with: - java-version: 11 + java-version: 17 - name: Run common tests run: ./gradlew :napier:test --stacktrace @@ -42,6 +42,8 @@ jobs: run: ./gradlew :napier:tvosX64Test --stacktrace - name: Run tvos(apple silicon) tests run: ./gradlew :napier:tvosSimulatorArm64Test --stacktrace + - name: Run wasmJs tests + run: ./gradlew :napier:wasmJsTest --stacktrace - name: Bundle the build report if: failure() diff --git a/android/build.gradle.kts b/android/build.gradle.kts index 0bd8729..467e1eb 100644 --- a/android/build.gradle.kts +++ b/android/build.gradle.kts @@ -14,10 +14,11 @@ android { buildToolsVersion(Versions.buildToolsVersion) defaultConfig { + namespace = "io.github.aakira.napier.sample" minSdkVersion(Versions.minSdkVersion) targetSdkVersion(Versions.targetSdkVersion) - versionCode(Versions.androidVersionCode) - versionName(Versions.androidVersionName) + versionCode = Versions.androidVersionCode + versionName = Versions.androidVersionName } buildTypes { @@ -36,11 +37,12 @@ android { buildFeatures { viewBinding = true + buildConfig = true } compileOptions { - sourceCompatibility(JavaVersion.VERSION_1_8) - targetCompatibility(JavaVersion.VERSION_1_8) + sourceCompatibility(JavaVersion.VERSION_17) + targetCompatibility(JavaVersion.VERSION_17) } } diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 4c8e0ef..5135eba 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,21 +1,22 @@ + xmlns:tools="http://schemas.android.com/tools"> - + android:name="io.github.aakira.napier.sample.NapierApp" + android:allowBackup="true" + android:icon="@mipmap/ic_launcher" + android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher_round" + android:supportsRtl="true" + android:theme="@style/AppTheme" + tools:ignore="GoogleAppIndexingWarning"> + - - + + diff --git a/buildSrc/src/main/kotlin/dependencies/Dep.kt b/buildSrc/src/main/kotlin/dependencies/Dep.kt index ef83903..ae6562f 100644 --- a/buildSrc/src/main/kotlin/dependencies/Dep.kt +++ b/buildSrc/src/main/kotlin/dependencies/Dep.kt @@ -2,12 +2,12 @@ package dependencies object Dep { - private const val kotlin = "1.6.21" + private const val kotlin = "1.9.21" object GradlePlugin { const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Dep.kotlin}" - const val android = "com.android.tools.build:gradle:4.2.1" + const val android = "com.android.tools.build:gradle:8.2.0" const val crashlytics = "com.google.firebase:firebase-crashlytics-gradle:2.5.2" const val googleService = "com.google.gms:google-services:4.3.5" @@ -20,7 +20,7 @@ object Dep { } object Coroutines { - private const val version = "1.6.0-native-mt" + private const val version = "1.8.0-RC2" const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version" } diff --git a/buildSrc/src/main/kotlin/dependencies/Versions.kt b/buildSrc/src/main/kotlin/dependencies/Versions.kt index b04b078..b429b13 100644 --- a/buildSrc/src/main/kotlin/dependencies/Versions.kt +++ b/buildSrc/src/main/kotlin/dependencies/Versions.kt @@ -2,13 +2,13 @@ package dependencies object Versions { const val versionCode = 25 - const val versionName = "2.6.1" + const val versionName = "2.7.0" // android const val androidVersionCode = 1 const val androidVersionName = "1.0.0" - const val compileSdkVersion = 30 + const val compileSdkVersion = 34 const val buildToolsVersion = "29.0.3" const val minSdkVersion = 16 - const val targetSdkVersion = 28 + const val targetSdkVersion = 34 } diff --git a/gradle.properties b/gradle.properties index 05ec979..eef2c4b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,6 @@ org.gradle.jvmargs=-Xms2048M -Xmx5120M -XX:MaxPermSize=2048M kotlin.code.style=official kotlin.native.distribution.type=prebuilt -kotlin.native.enableDependencyPropagation=false -kotlin.mpp.enableGranularSourceSetsMetadata=true -kotlin.mpp.enableCompatibilityMetadataVariant=true # Android android.useAndroidX=true diff --git a/gradle/publish.gradle.kts b/gradle/publish.gradle.kts index 86c53c8..13a7683 100644 --- a/gradle/publish.gradle.kts +++ b/gradle/publish.gradle.kts @@ -68,6 +68,12 @@ publishing { } } + // FIXME - workaround for https://github.com/gradle/gradle/issues/26091 + val signingTasks = tasks.withType() + tasks.withType().configureEach { + mustRunAfter(signingTasks) + } + repositories { maven { name = "Sonatype" diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 28861d2..033e24c 100644 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 abb8619..744c64d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Mar 04 17:14:14 JST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip diff --git a/gradlew b/gradlew index cccdd3d..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,126 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for 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/HEAD/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_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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # 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 + # 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" + 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 @@ -81,92 +129,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 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*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + 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" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; 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\"" + 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=$((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, 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" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$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"' + +# 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 \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 @@ -9,19 +25,23 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused 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= +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 init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :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 %CMD_LINE_ARGS% +"%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 +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/mpp-sample/build.gradle.kts b/mpp-sample/build.gradle.kts index f7d5563..13db330 100644 --- a/mpp-sample/build.gradle.kts +++ b/mpp-sample/build.gradle.kts @@ -141,10 +141,11 @@ android { buildToolsVersion(Versions.buildToolsVersion) defaultConfig { + namespace = "io.github.aakira.napier.mppsample" minSdkVersion(Versions.minSdkVersion) targetSdkVersion(Versions.targetSdkVersion) - versionCode(Versions.androidVersionCode) - versionName(Versions.androidVersionName) +// versionCode(Versions.androidVersionCode) +// versionName(Versions.androidVersionName) } sourceSets { @@ -152,4 +153,9 @@ android { manifest.srcFile("src/androidMain/AndroidManifest.xml") } } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } } diff --git a/mpp-sample/mpp_sample.podspec b/mpp-sample/mpp_sample.podspec index ba4f35a..729269f 100644 --- a/mpp-sample/mpp_sample.podspec +++ b/mpp-sample/mpp_sample.podspec @@ -11,6 +11,17 @@ Pod::Spec.new do |spec| + if !Dir.exist?('build/cocoapods/framework/mpp_sample.framework') || Dir.empty?('build/cocoapods/framework/mpp_sample.framework') + raise " + + Kotlin framework 'mpp_sample' doesn't exist yet, so a proper Xcode project can't be generated. + 'pod install' should be executed after running ':generateDummyFramework' Gradle task: + + ./gradlew :mpp-sample:generateDummyFramework + + Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" + end + spec.pod_target_xcconfig = { 'KOTLIN_PROJECT_PATH' => ':mpp-sample', 'PRODUCT_MODULE_NAME' => 'mpp_sample', @@ -22,8 +33,8 @@ Pod::Spec.new do |spec| :execution_position => :before_compile, :shell_path => '/bin/sh', :script => <<-SCRIPT - if [ "YES" = "$COCOAPODS_SKIP_KOTLIN_BUILD" ]; then - echo "Skipping Gradle build task invocation due to COCOAPODS_SKIP_KOTLIN_BUILD environment variable set to \"YES\"" + if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then + echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\"" exit 0 fi set -ev diff --git a/mpp-sample/src/androidMain/AndroidManifest.xml b/mpp-sample/src/androidMain/AndroidManifest.xml index 8535479..8072ee0 100644 --- a/mpp-sample/src/androidMain/AndroidManifest.xml +++ b/mpp-sample/src/androidMain/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/napier/build.gradle.kts b/napier/build.gradle.kts index 3579449..73692cf 100644 --- a/napier/build.gradle.kts +++ b/napier/build.gradle.kts @@ -1,5 +1,6 @@ import dependencies.Dep import dependencies.Versions +import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl plugins { kotlin("multiplatform") @@ -12,10 +13,12 @@ kotlin { android { publishAllLibraryVariants() } - js(BOTH) { + js(IR) { browser() nodejs() } + @OptIn(ExperimentalWasmDsl::class) + wasmJs() jvm() // darwin @@ -64,7 +67,7 @@ kotlin { dependencies { } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation(Dep.Test.jvm) } @@ -80,6 +83,16 @@ kotlin { implementation(Dep.Test.js) } } + val wasmJsMain by getting { + dependencies { + implementation(Dep.Kotlin.js) + } + } + val wasmJsTest by getting { + dependencies { + implementation(Dep.Test.js) + } + } val jvmMain by getting { dependencies { implementation(Dep.Kotlin.jvm) @@ -211,14 +224,12 @@ kotlin { } android { - compileSdkVersion(Versions.compileSdkVersion) - buildToolsVersion(Versions.buildToolsVersion) + compileSdk = Versions.compileSdkVersion + buildToolsVersion = Versions.buildToolsVersion defaultConfig { - minSdkVersion(Versions.minSdkVersion) - targetSdkVersion(Versions.targetSdkVersion) - versionCode(Versions.androidVersionCode) - versionName(Versions.androidVersionName) + namespace = "io.github.aakira.napier" + minSdk = Versions.minSdkVersion } sourceSets { @@ -226,4 +237,9 @@ android { manifest.srcFile("src/androidMain/AndroidManifest.xml") } } + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } } diff --git a/napier/src/androidTest/kotlin/io/github/aakira/napier/NapierAndroidTest.kt b/napier/src/androidUnitTest/kotlin/io/github/aakira/napier/NapierAndroidTest.kt similarity index 100% rename from napier/src/androidTest/kotlin/io/github/aakira/napier/NapierAndroidTest.kt rename to napier/src/androidUnitTest/kotlin/io/github/aakira/napier/NapierAndroidTest.kt diff --git a/napier/src/androidTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt b/napier/src/androidUnitTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt similarity index 100% rename from napier/src/androidTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt rename to napier/src/androidUnitTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt diff --git a/napier/src/darwinMain/kotlin/io/github/aakira/napier/DebugAntilog.kt b/napier/src/darwinMain/kotlin/io/github/aakira/napier/DebugAntilog.kt index a56bb5a..c278394 100644 --- a/napier/src/darwinMain/kotlin/io/github/aakira/napier/DebugAntilog.kt +++ b/napier/src/darwinMain/kotlin/io/github/aakira/napier/DebugAntilog.kt @@ -3,6 +3,7 @@ package io.github.aakira.napier import platform.Foundation.NSDate import platform.Foundation.NSDateFormatter import platform.Foundation.NSThread +import kotlin.experimental.ExperimentalNativeApi private const val CALL_STACK_INDEX = 8 @@ -27,6 +28,7 @@ actual class DebugAntilog( LogLevel.ASSERT to "💞 ASSERT" ) + @OptIn(ExperimentalNativeApi::class) override fun performLog( priority: LogLevel, tag: String?, diff --git a/napier/src/darwinMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt b/napier/src/darwinMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt index 54ff37d..16ee84a 100644 --- a/napier/src/darwinMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt +++ b/napier/src/darwinMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt @@ -1,6 +1,6 @@ package io.github.aakira.napier.atomic -import kotlin.native.concurrent.AtomicReference +import kotlin.concurrent.AtomicReference import kotlin.native.concurrent.freeze internal actual class AtomicRef actual constructor(value: T) { diff --git a/napier/src/wasmJsMain/kotlin/io/github/aakira/napier/DebugAntilog.kt b/napier/src/wasmJsMain/kotlin/io/github/aakira/napier/DebugAntilog.kt new file mode 100644 index 0000000..68ed0e0 --- /dev/null +++ b/napier/src/wasmJsMain/kotlin/io/github/aakira/napier/DebugAntilog.kt @@ -0,0 +1,54 @@ +package io.github.aakira.napier + + +private fun log(message: String): Unit = js( + """{ + console.log(message); + }""" +) + +private fun info(message: String): Unit = js( + """{ + console.info(message); + }""" +) + +private fun warn(message: String): Unit = js( + """{ + console.warn(message); + }""" +) +private fun error(message: String): Unit = js( + """{ + console.error(message); + }""" +) + +actual class DebugAntilog actual constructor(private val defaultTag: String) : Antilog() { + + override fun performLog( + priority: LogLevel, + tag: String?, + throwable: Throwable?, + message: String?, + ) { + val logTag = tag ?: defaultTag + + val fullMessage = if (message != null) { + if (throwable != null) { + "$message\n${throwable.message}" + } else { + message + } + } else throwable?.message ?: return + + when (priority) { + LogLevel.VERBOSE -> log("VERBOSE $logTag : $fullMessage") + LogLevel.DEBUG -> log("DEBUG $logTag : $fullMessage") + LogLevel.INFO -> info("INFO $logTag : $fullMessage") + LogLevel.WARNING -> warn("WARNING $logTag : $fullMessage") + LogLevel.ERROR -> error("ERROR $logTag : $fullMessage") + LogLevel.ASSERT -> error("ASSERT $logTag : $fullMessage") + } + } +} diff --git a/napier/src/wasmJsMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt b/napier/src/wasmJsMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt new file mode 100644 index 0000000..30f7636 --- /dev/null +++ b/napier/src/wasmJsMain/kotlin/io/github/aakira/napier/atomic/AtomicRef.kt @@ -0,0 +1,3 @@ +package io.github.aakira.napier.atomic + +internal actual class AtomicRef actual constructor(actual var value: T) diff --git a/napier/src/wasmJsTest/kotlin/io/github/aakira/napier/NapierJsTest.kt b/napier/src/wasmJsTest/kotlin/io/github/aakira/napier/NapierJsTest.kt new file mode 100644 index 0000000..29e6052 --- /dev/null +++ b/napier/src/wasmJsTest/kotlin/io/github/aakira/napier/NapierJsTest.kt @@ -0,0 +1,4 @@ +package io.github.aakira.napier + +class NapierJsTest { +} diff --git a/napier/src/wasmJsTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt b/napier/src/wasmJsTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt new file mode 100644 index 0000000..523d4af --- /dev/null +++ b/napier/src/wasmJsTest/kotlin/io/github/aakira/napier/TestRunBlocking.kt @@ -0,0 +1,9 @@ +package io.github.aakira.napier + +import kotlinx.coroutines.GlobalScope +import kotlinx.coroutines.promise +import kotlin.coroutines.EmptyCoroutineContext + +actual fun testRunBlocking(block: suspend () -> T) { + GlobalScope.promise(EmptyCoroutineContext) { block() } +}