diff --git a/build-logic/convention/src/main/kotlin/config/KmpConfig.kt b/build-logic/convention/src/main/kotlin/config/KmpConfig.kt index ccdcf596..d5adc03e 100644 --- a/build-logic/convention/src/main/kotlin/config/KmpConfig.kt +++ b/build-logic/convention/src/main/kotlin/config/KmpConfig.kt @@ -52,7 +52,7 @@ fun KotlinMultiplatformExtension.kmp( getIosTargets(project, tvOSEnabled).forEach { it.binaries.framework { baseName = nativeName - isStatic = false + isStatic = true export(libs.mokoResources) export(project(":shared:base")) export(project(":shared:analytics")) diff --git a/build-logic/convention/src/main/kotlin/extensions/PojectExtensions.kt b/build-logic/convention/src/main/kotlin/extensions/PojectExtensions.kt index 9fe03427..06f72fc8 100644 --- a/build-logic/convention/src/main/kotlin/extensions/PojectExtensions.kt +++ b/build-logic/convention/src/main/kotlin/extensions/PojectExtensions.kt @@ -58,7 +58,7 @@ inline fun Project.extension(name: String, block: Action) { extensions.configure(name, block) } -fun NamedDomainObjectContainer.demo(action: BuildTypeT.() -> Unit) { +fun NamedDomainObjectContainer.demo(action: BuildTypeT.() -> Unit) { create("demo", action) } diff --git a/build.gradle.kts b/build.gradle.kts index 73932bfe..fff2661a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask +import org.gradle.kotlin.dsl.register plugins { alias(libs.plugins.android.application) apply false @@ -18,7 +19,7 @@ plugins { } fun String.isNonStable(): Boolean { - val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { toUpperCase().contains(it) } + val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { uppercase().contains(it) } val regex = "^[0-9,.v-]+(-r)?$".toRegex() val isStable = stableKeyword || regex.matches(this) return isStable.not() @@ -34,11 +35,9 @@ versionCatalogUpdate { sortByKey.set(false) keep { keepUnusedVersions.set(true) - keepUnusedLibraries.set(true) - keepUnusedPlugins.set(true) } } -tasks.create("clean") { - delete(rootProject.buildDir) +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) } diff --git a/gradle.properties b/gradle.properties index 1f686da8..6d684631 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,8 +12,6 @@ moko.resources.disableStaticFrameworkWarning=true sentiary.projectId=sL617ZwnlaW151ZJfDYc sentiary.projectApiKey=tJr4F92ZaVxN4vBy/GFHICa9DhmimkhdBjETSAMXLxPn+j17ngXD8y+yQBvTgmuhhm3VvVRtv7qzpSoGvPLwNQ== # Caches -kotlin.native.cacheKind.iosArm64=static -kotlin.native.cacheKind.iosSimulatorArm64=static kotlin.incremental.native=false org.gradle.caching=true org.gradle.parallel=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 92195bda..176ca66a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,48 +1,47 @@ [versions] sdk-min = "23" sdk-target = "34" -sdk-compile = "35" +sdk-compile = "36" java = "21" -kotlin = "2.2.10" -gradlePlugin = "8.11.1" +kotlin = "2.3.20" +gradlePlugin = "8.13.2" coroutines = "1.10.2" -dateTime = "0.6.0" -atomicFu = "0.23.2" -koin = "4.1.1" -androidXCore = "1.13.1" -androidXNavigation = "2.9.0-rc01" +dateTime = "0.7.1" +atomicFu = "0.32.1" +koin = "4.2.1" +androidXCore = "1.18.0" +androidXNavigation = "2.9.2" material = "1.13.0" material-icons = "1.7.3" -lifecycle = "2.9.3" -paging = "3.3.6" -composeBom = "2025.08.01" -jetbrains-composePlugin = "1.8.2" -activity = "1.10.1" -navigation = "2.9.3" +lifecycle = "2.10.0" +paging = "3.4.2" +composeBom = "2026.03.01" +jetbrains-composePlugin = "1.11.0-beta01" # Note: version 1.11.X fixes iOS lags +activity = "1.13.0" +navigation = "2.9.7" accompanist = "0.36.0" -ktor = "3.2.3" -kermit = "2.0.8" +ktor = "3.4.2" +kermit = "2.1.0" settings = "1.3.0" googlePlayServices = "21.3.0" -ktLint = "11.6.0" +ktLint = "11.6.0" # Note: Do not update ktLint as they changed the ruleset ktLint-rules = "0.3.8" -kotlinxImmutableCollections = "0.4.0" konsist = "0.13.0" +kotlinxImmutableCollections = "0.4.0" junit = "4.13.2" -coroutine-test = "1.8.1" -mokoResources = "0.25.0" +coroutine-test = "1.10.2" +mokoResources = "0.26.3" junitVersion = "1.2.1" espressoCore = "3.6.1" appcompat = "1.7.1" -versionCatalogueUpdate = "0.8.1" -versions = "0.49.0" -desugar = "2.1.2" +versionCatalogueUpdate = "1.1.0" +versions = "0.53.0" +desugar = "2.1.5" uiautomator = "2.3.0" -molecule = "2.1.0" -skie = "0.10.6" +molecule = "2.2.0" +skie = "0.10.11" firebase = "22.5.0" -googleServices = "4.4.3" -jetbrainsKotlinJvm = "2.2.10" +googleServices = "4.4.4" sentiary = "1.0.1" [libraries] @@ -177,4 +176,4 @@ mateeStarter-kmp-library-core = "kmp-library:none" mateeStarter-kmp-library-compose = "kmp-library-compose:none" mateeStarter-kmp-framework-library = "kmp-framework-library:none" mateeStarter-kmp-sentiary = "kmp-sentiary-library-convention:none" -jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "jetbrainsKotlinJvm" } +jetbrains-kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..1b33c55b 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 b987eb86..c61a118f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ -#Mon Apr 12 11:15:46 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index cccdd3d5..23d15a93 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/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. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## 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/platforms/jvm/plugins-application/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || 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 +CLASSPATH="\\\"\\\"" + # 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 +132,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=SC2039,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=SC2039,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 optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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 e95643d6..5eed7ee8 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,22 @@ -@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 +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,25 +27,29 @@ 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. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -35,48 +57,36 @@ 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% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 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 +set CLASSPATH= + @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%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :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/ios/.swiftlint.yml b/ios/.swiftlint.yml index 7f92d5a7..32d59c3c 100644 --- a/ios/.swiftlint.yml +++ b/ios/.swiftlint.yml @@ -2,10 +2,9 @@ excluded: - Carthage - Pods - vendor - - DataLayer/Providers/GraphQLProvider/.build - DataLayer/Toolkits/RocketToolkit/Sources/RocketToolkit/NetworkModels/Apollo - DataLayer/Toolkits/RocketToolkit/Sources/RocketToolkitMocks - - DomainLayer/SharedDomain/.build + - "**/.build/**" indentation: 2 cyclomatic_complexity: 10 diff --git a/ios/MateeStarter.xcodeproj/project.pbxproj b/ios/MateeStarter.xcodeproj/project.pbxproj index 0a2f620d..e1c2ece0 100644 --- a/ios/MateeStarter.xcodeproj/project.pbxproj +++ b/ios/MateeStarter.xcodeproj/project.pbxproj @@ -208,6 +208,7 @@ 453D3FCD25ED976A0094ADD7 /* Copy GoogleService-Info.plist */, 45DEBE2627A153A20075C7E2 /* Embed Foundation Extensions */, 4564A9F7289CFF3D00A0FEF0 /* Upload dSYMs to Crashlytics */, + E2F40A98301D2BF000B8B111 /* Copy moko resources to app */, ); buildRules = ( ); @@ -344,6 +345,25 @@ shellPath = /bin/sh; shellScript = "cd \"${PROJECT_DIR}\"\nscripts/swiftlint.sh\n"; }; + E2F40A98301D2BF000B8B111 /* Copy moko resources to app */ = { + isa = PBXShellScriptBuildPhase; + alwaysOutOfDate = 1; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Copy moko resources to app"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../\" :shared:umbrella:copyFrameworkResourcesToApp \\\n -Pmoko.resources.PLATFORM_NAME=\"$PLATFORM_NAME\" \\\n -Pmoko.resources.CONFIGURATION=\"${KOTLIN_FRAMEWORK_BUILD_TYPE:-$CONFIGURATION}\" \\\n -Pmoko.resources.ARCHS=\"$ARCHS\" \\\n -Pmoko.resources.BUILT_PRODUCTS_DIR=\"$BUILT_PRODUCTS_DIR\" \\\n -Pmoko.resources.CONTENTS_FOLDER_PATH=\"$CONTENTS_FOLDER_PATH\" \n"; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/View+Extensions.swift b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/View+Extensions.swift index d8ba51b5..42ef97cd 100644 --- a/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/View+Extensions.swift +++ b/ios/PresentationLayer/UIToolkit/Sources/UIToolkit/Extensions/View+Extensions.swift @@ -39,7 +39,7 @@ public extension View { @MainActor public extension View { - @inlinable func bindViewModel( + func bindViewModel( _ viewModel: BaseScopedViewModel, onEvent: @escaping (E) -> Void ) -> some View { diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/KonsistScope.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/KonsistScope.kt new file mode 100644 index 00000000..ad885c8d --- /dev/null +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/KonsistScope.kt @@ -0,0 +1,7 @@ +package konsistTest + +import com.lemonappdev.konsist.api.Konsist + +// Exclude the root iOS workspace +internal fun scopeFromProjectExcludingIos() = + Konsist.scopeFromProject() - Konsist.scopeFromDirectory("ios") diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/android/compose/ComposeTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/android/compose/ComposeTest.kt index f49d34cd..b09cedcb 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/android/compose/ComposeTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/android/compose/ComposeTest.kt @@ -1,18 +1,17 @@ package konsistTest.android.compose -import com.lemonappdev.konsist.api.Konsist import com.lemonappdev.konsist.api.ext.list.modifierprovider.withInternalModifier import com.lemonappdev.konsist.api.ext.list.modifierprovider.withPublicOrDefaultModifier import com.lemonappdev.konsist.api.ext.list.withAnnotation import com.lemonappdev.konsist.api.ext.list.withType import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import org.junit.Test internal class ComposeTest { @Test fun `every internal or public compose function has a modifier`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .functions() .let { fns -> fns.withPublicOrDefaultModifier() + diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/common/GeneralTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/common/GeneralTest.kt index be30494d..2d49cdb1 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/common/GeneralTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/common/GeneralTest.kt @@ -1,17 +1,16 @@ package konsistTest.common import com.lemonappdev.konsist.api.KoModifier -import com.lemonappdev.konsist.api.Konsist import com.lemonappdev.konsist.api.verify.assertFalse import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import org.junit.Ignore import org.junit.Test internal class GeneralTest { @Test fun `companion objects are last declarations in the class`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .assertTrue { val companionObjects = it.objects( @@ -32,24 +31,21 @@ internal class GeneralTest { @Test fun `no empty files allowed`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .files .assertFalse { it.text.isEmpty() } } @Test fun `package name must match file path`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .packages .assertTrue { it.hasMatchingPath } } @Test fun `no wildcard imports allowed`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .imports .assertFalse { it.isWildcard } } @@ -57,8 +53,7 @@ internal class GeneralTest { @Ignore("DevStack currently uses android log...") @Test fun `no class should use Android util logging`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .files .assertFalse { it.hasImport { import -> import.name == "android.util.Log" } } } diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/data/DataTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/data/DataTest.kt index a37d29b5..dfc809ad 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/data/DataTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/data/DataTest.kt @@ -1,20 +1,19 @@ package konsistTest.data -import com.lemonappdev.konsist.api.Konsist import com.lemonappdev.konsist.api.ext.list.print import com.lemonappdev.konsist.api.ext.list.withName import com.lemonappdev.konsist.api.ext.list.withNameContaining import com.lemonappdev.konsist.api.ext.list.withPackage import com.lemonappdev.konsist.api.ext.list.withoutReceiverType import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import kotlinx.serialization.Serializable import org.junit.Test internal class DataTest { @Test fun `all DTOs are internal or private`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..data.model..") .assertTrue { klass -> @@ -24,8 +23,7 @@ internal class DataTest { @Test fun `all classes in 'data model' package are annotated with Serializable`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..data.model..") .assertTrue { klass -> @@ -35,8 +33,7 @@ internal class DataTest { @Test fun `all classes in 'data model' have immutable properties`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..data.model..") .assertTrue { klass -> @@ -47,8 +44,7 @@ internal class DataTest { @Test fun `all 'toDomain()' extensions functions are either internal or private`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .functions() .withPackage("..data..") .withName("toDomain") @@ -58,8 +54,7 @@ internal class DataTest { @Test fun `all 'toDomain()' function are in the 'data' package`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .functions() .filter { it.isTopLevel } .withoutReceiverType { it.name.contains("ViewObject") } diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/di/KoinTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/di/KoinTest.kt index 562bf6f2..4e13c584 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/di/KoinTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/di/KoinTest.kt @@ -1,20 +1,19 @@ package konsistTest.di import com.lemonappdev.konsist.api.KoModifier -import com.lemonappdev.konsist.api.Konsist import com.lemonappdev.konsist.api.ext.list.modifierprovider.withoutModifier import com.lemonappdev.konsist.api.ext.list.withNameEndingWith import com.lemonappdev.konsist.api.ext.list.withPackage import com.lemonappdev.konsist.api.ext.list.withParent import com.lemonappdev.konsist.api.provider.KoFullyQualifiedNameProvider import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import org.junit.Test internal class KoinTest { @Test fun `every 'ViewModel' has a declaration in Koin's module`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withoutModifier(KoModifier.ABSTRACT) .withNameEndingWith("ViewModel") @@ -23,8 +22,7 @@ internal class KoinTest { @Test fun `every 'Repository' has a declaration in Koin's module`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..data..") .withParent { it.hasNameEndingWith("Repository") } @@ -34,8 +32,7 @@ internal class KoinTest { @Test fun `every 'Source' has a declaration in Koin's module`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..data..") .withParent { it.hasNameEndingWith("Source") } @@ -45,8 +42,7 @@ internal class KoinTest { @Test fun `every 'Service' has a declaration in Koin's module`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..data..") .withParent { it.hasNameEndingWith("Service") } @@ -56,8 +52,7 @@ internal class KoinTest { @Test fun `every 'UseCase' has a declaration in Koin's module`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..domain..") .withParent { it.hasNameEndingWith("UseCase") } @@ -70,8 +65,7 @@ internal class KoinTest { this.assertTrue { modules.any { file -> file.hasImportWithName(it.fullyQualifiedName) } } } - private fun getKoinModules() = Konsist - .scopeFromProject() + private fun getKoinModules() = scopeFromProjectExcludingIos() .properties() .withNameEndingWith("Module", "module") .filter { it.text.contains("= module {") } diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/model/DomainModelsTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/model/DomainModelsTest.kt index 790c7c60..dc8ab4fb 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/model/DomainModelsTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/model/DomainModelsTest.kt @@ -1,18 +1,17 @@ package konsistTest.domain.model import com.lemonappdev.konsist.api.KoModifier -import com.lemonappdev.konsist.api.Konsist import com.lemonappdev.konsist.api.ext.list.modifierprovider.withModifier import com.lemonappdev.konsist.api.ext.list.withPackage import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import org.junit.Test internal class DomainModelsTest { @Test fun `all domain model data classes have a primary constructor with all properties immutable`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withPackage("..domain.model") .withModifier(KoModifier.DATA) diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/usecase/UseCaseTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/usecase/UseCaseTest.kt index a478ff96..c2a7d6da 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/usecase/UseCaseTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/domain/usecase/UseCaseTest.kt @@ -6,14 +6,14 @@ import com.lemonappdev.konsist.api.ext.list.withName import com.lemonappdev.konsist.api.ext.list.withParameters import com.lemonappdev.konsist.api.ext.list.withParent import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import org.junit.Test internal class UseCaseTest { @Test fun `implementations of use cases are internal`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withParent { parent -> parent.hasNameContaining("UseCase") @@ -23,8 +23,7 @@ internal class UseCaseTest { @Test fun `interfaces extending 'UseCase' should have 'UseCase' suffix`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .interfaces() .withParent { it.name.isUseCase() } .assertTrue { it.name.endsWith("UseCase") } @@ -32,8 +31,7 @@ internal class UseCaseTest { @Test fun `interfaces extending 'UseCase' reside in the 'domain' and 'usecase' package`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .interfaces() .withParent { it.name.isUseCase() } .assertTrue { it.resideInPackage("..domain..usecase..") } @@ -41,8 +39,7 @@ internal class UseCaseTest { @Test fun `classes extending 'UseCase' that have their own functions must be private`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withParent { it.hasNameContaining("UseCase") } .assertTrue { klass -> @@ -55,8 +52,7 @@ internal class UseCaseTest { @Test fun `classes extending 'UseCase' must have all properties private`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withParent { it.hasNameContaining("UseCase") } .properties(includeNested = false, includeLocal = false) @@ -67,8 +63,7 @@ internal class UseCaseTest { @Test fun `interfaces extending 'UseCase' with params should have 'Params' data class that is used as param`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .interfaces() .withParent { parent -> parent.name.isUseCaseWithParams() } .assertTrue { useCaseInterface -> diff --git a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/repository/RepositoryTest.kt b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/repository/RepositoryTest.kt index 58beffc5..d61b68fe 100644 --- a/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/repository/RepositoryTest.kt +++ b/shared/umbrella/src/androidUnitTest/kotlin/konsistTest/repository/RepositoryTest.kt @@ -1,16 +1,15 @@ package konsistTest.repository -import com.lemonappdev.konsist.api.Konsist import com.lemonappdev.konsist.api.ext.list.withNameContaining import com.lemonappdev.konsist.api.verify.assertTrue +import konsistTest.scopeFromProjectExcludingIos import org.junit.Test @Suppress("konsist.all repositories inherit from a corresponding interface") class RepositoryTest { @Test fun `all repositories inherit from a corresponding interface`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withNameContaining("Repository") .assertTrue { klass -> @@ -23,8 +22,7 @@ class RepositoryTest { @Test fun `'Repository' implementation classes should reside in 'data' and 'repository' package`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .classes() .withNameContaining("Repository") .filter { it.numParents == 1 } @@ -33,8 +31,7 @@ class RepositoryTest { @Test fun `'Repository' interfaces should reside in 'domain' and 'repository' package`() { - Konsist - .scopeFromProject() + scopeFromProjectExcludingIos() .interfaces() .withNameContaining("Repository") .assertTrue { it.resideInPackage("..domain.repository..") } diff --git a/shared/umbrella/src/iosMain/kotlin/kmp/shared/umbrella/KotlinDateTime.kt b/shared/umbrella/src/iosMain/kotlin/kmp/shared/umbrella/KotlinDateTime.kt index afe48363..c1375b7d 100644 --- a/shared/umbrella/src/iosMain/kotlin/kmp/shared/umbrella/KotlinDateTime.kt +++ b/shared/umbrella/src/iosMain/kotlin/kmp/shared/umbrella/KotlinDateTime.kt @@ -1,6 +1,5 @@ package kmp.shared.umbrella -import kotlinx.datetime.Instant import kotlinx.datetime.LocalDate import kotlinx.datetime.LocalDateTime import kotlinx.datetime.TimeZone @@ -9,6 +8,7 @@ import kotlinx.datetime.toKotlinInstant import kotlinx.datetime.toLocalDateTime import kotlinx.datetime.toNSDateComponents import platform.Foundation.NSDate +import kotlin.time.Instant // Force the companion object to be included in the framework. For example, upon adding the following code to Platform.kt in iosMain in a sample KMM project, the companion object was included in the headers: fun Instant.Companion.dummy(): Nothing = TODO() diff --git a/shared/umbrella/src/iosMain/swift/extensions/Interoperability+Extensions.swift b/shared/umbrella/src/iosMain/swift/extensions/Interoperability+Extensions.swift index 9c58125d..eecd2f5c 100644 --- a/shared/umbrella/src/iosMain/swift/extensions/Interoperability+Extensions.swift +++ b/shared/umbrella/src/iosMain/swift/extensions/Interoperability+Extensions.swift @@ -46,13 +46,13 @@ public extension Optional where Wrapped == KotlinLong { } } - public extension Optional where Wrapped == Kotlinx_datetimeInstant { + public extension Optional where Wrapped == KotlinInstant { var asDate: Date? { Date(timeIntervalSince1970: TimeInterval(self?.epochSeconds ?? 0)) } } - public extension Kotlinx_datetimeInstant { + public extension KotlinInstant { var asDate: Date { Date(timeIntervalSince1970: TimeInterval(self.epochSeconds)) } @@ -89,7 +89,7 @@ public extension Optional where Wrapped == KotlinLong { } public extension Date { - var asInstant: Kotlinx_datetimeInstant { + var asInstant: KotlinInstant { KotlinDateTimeKt.toInstant(self) } var asLocalDate: Kotlinx_datetimeLocalDate {