diff --git a/appyx-components/experimental/modal/common/build.gradle.kts b/appyx-components/experimental/modal/common/build.gradle.kts index 658b93d18..d628c9689 100644 --- a/appyx-components/experimental/modal/common/build.gradle.kts +++ b/appyx-components/experimental/modal/common/build.gradle.kts @@ -43,7 +43,7 @@ kotlin { implementation(kotlin("test")) } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation(libs.junit) } diff --git a/appyx-components/stable/spotlight/common/build.gradle.kts b/appyx-components/stable/spotlight/common/build.gradle.kts index 635bdebe2..c301bf17e 100644 --- a/appyx-components/stable/spotlight/common/build.gradle.kts +++ b/appyx-components/stable/spotlight/common/build.gradle.kts @@ -44,7 +44,7 @@ kotlin { implementation(kotlin("test")) } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation(libs.junit) } diff --git a/appyx-interactions/common/build.gradle.kts b/appyx-interactions/common/build.gradle.kts index be9e7b627..250d96375 100644 --- a/appyx-interactions/common/build.gradle.kts +++ b/appyx-interactions/common/build.gradle.kts @@ -51,7 +51,7 @@ kotlin { api(libs.androidx.core) } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation(libs.junit) } diff --git a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt index ee74a390c..64333bc34 100644 --- a/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt +++ b/appyx-interactions/common/src/commonMain/kotlin/com/bumble/appyx/interactions/core/modifiers/OnPointerEventNode.kt @@ -1,6 +1,5 @@ package com.bumble.appyx.interactions.core.modifiers -import androidx.compose.ui.ExperimentalComposeUiApi import androidx.compose.ui.Modifier import androidx.compose.ui.input.pointer.PointerEvent import androidx.compose.ui.input.pointer.PointerEventPass @@ -9,7 +8,6 @@ import androidx.compose.ui.node.PointerInputModifierNode import androidx.compose.ui.platform.InspectorInfo import androidx.compose.ui.unit.IntSize -@OptIn(ExperimentalComposeUiApi::class) class OnPointerEventNode(var callback: (PointerEvent) -> Unit) : PointerInputModifierNode, Modifier.Node() { override fun onPointerEvent( @@ -29,14 +27,12 @@ class OnPointerEventNode(var callback: (PointerEvent) -> Unit) : } } -@OptIn(ExperimentalComposeUiApi::class) data class PointerInputElement( val callback: (PointerEvent) -> Unit ) : ModifierNodeElement() { override fun create() = OnPointerEventNode(callback) - override fun update(node: OnPointerEventNode): OnPointerEventNode { + override fun update(node: OnPointerEventNode) { node.callback = callback - return node } override fun InspectorInfo.inspectableProperties() { diff --git a/demos/appyx-interactions/iosApp/Podfile.lock b/demos/appyx-interactions/iosApp/Podfile.lock index ca8002ac9..b102dd8ab 100644 --- a/demos/appyx-interactions/iosApp/Podfile.lock +++ b/demos/appyx-interactions/iosApp/Podfile.lock @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../ios" SPEC CHECKSUMS: - ios: 8191875220b69f28f1312f76f27ebe46e596c7d1 + ios: 6d03ec3b5eeabfc87bb0f133523ad6901a71ed3b PODFILE CHECKSUM: a1e557981a2880940a401c85ea35aafdd5895941 diff --git a/demos/appyx-interactions/iosApp/iosApp.xcodeproj/project.pbxproj b/demos/appyx-interactions/iosApp/iosApp.xcodeproj/project.pbxproj index c888c0443..21c00194e 100644 --- a/demos/appyx-interactions/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/demos/appyx-interactions/iosApp/iosApp.xcodeproj/project.pbxproj @@ -114,6 +114,7 @@ 7555FF77242A565900829871 /* Sources */, 7555FF79242A565900829871 /* Resources */, F85CB1118929364A9C6EFABC /* Frameworks */, + DC181123632E88DCC8F3A89D /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -192,6 +193,23 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; + DC181123632E88DCC8F3A89D /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/demos/appyx-navigation/iosApp/Podfile.lock b/demos/appyx-navigation/iosApp/Podfile.lock index 587d112ee..f9b014e63 100644 --- a/demos/appyx-navigation/iosApp/Podfile.lock +++ b/demos/appyx-navigation/iosApp/Podfile.lock @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../ios" SPEC CHECKSUMS: - ios: 310d76ca95383dcf31f70ae1688b136b92834c28 + ios: da81bbce1e8ed2234223669de1a78f23f47e4cf5 PODFILE CHECKSUM: a1e557981a2880940a401c85ea35aafdd5895941 diff --git a/demos/appyx-navigation/iosApp/iosApp.xcodeproj/project.pbxproj b/demos/appyx-navigation/iosApp/iosApp.xcodeproj/project.pbxproj index c888c0443..af2d47b63 100644 --- a/demos/appyx-navigation/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/demos/appyx-navigation/iosApp/iosApp.xcodeproj/project.pbxproj @@ -114,6 +114,7 @@ 7555FF77242A565900829871 /* Sources */, 7555FF79242A565900829871 /* Resources */, F85CB1118929364A9C6EFABC /* Frameworks */, + 5070500064C1023CB97B9B89 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -170,6 +171,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 5070500064C1023CB97B9B89 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; 98D614C51D2DA07C614CC46E /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/demos/common/build.gradle.kts b/demos/common/build.gradle.kts index 2d4ae0e11..29d6f93de 100644 --- a/demos/common/build.gradle.kts +++ b/demos/common/build.gradle.kts @@ -45,7 +45,7 @@ kotlin { implementation(libs.coil.compose) } } - val androidTest by getting { + val androidUnitTest by getting { dependencies { implementation(libs.junit) } diff --git a/detekt.yml b/detekt.yml index 38bc362a2..df56a8b4c 100644 --- a/detekt.yml +++ b/detekt.yml @@ -17,9 +17,9 @@ style: ForbiddenComment: allowedPatterns: 'https://github.com/bumble-tech/appyx/issues/*' MagicNumber: - excludes: [ '**/test/**', '**/*Test.kt', '**/demos/**', '**/androidTest/**', '**/commonTest/**', '**/desktopTest/**' , '**/jsTest/**' ] + excludes: [ '**/test/**', '**/*Test.kt', '**/demos/**', '**/androidUnitTest/**', '**/commonTest/**', '**/desktopTest/**' , '**/jsTest/**' ] MaxLineLength: - excludes: [ '**/test/**', '**/*.Test.kt', '**/*.Spec.kt', '**/androidTest/**', '**/commonTest/**', '**/desktopTest/**' , '**/jsTest/**' ] + excludes: [ '**/test/**', '**/*.Test.kt', '**/*.Spec.kt', '**/androidUnitTest/**', '**/commonTest/**', '**/desktopTest/**' , '**/jsTest/**' ] excludeCommentStatements: true UnusedPrivateMember: # https://detekt.dev/docs/introduction/compose#unusedprivatemember diff --git a/gradle.properties b/gradle.properties index dc029ce8d..9f6d592a7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -14,4 +14,3 @@ org.jetbrains.compose.experimental.jscanvas.enabled=true kotlin.mpp.stability.nowarn=true kotlin.mpp.enableCInteropCommonization=true org.jetbrains.compose.experimental.uikit.enabled=true -kotlin.native.cacheKind=none diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a5d3fde20..44190b7a7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,22 +3,22 @@ [versions] accompanist = "0.28.0" agp = "8.1.1" -androidCompileSdk = "33" +androidCompileSdk = "34" androidMinSdk = "21" androidTargetSdk = "32" androidx-lifecycle = "2.6.1" androidx-navigation-compose = "2.5.1" coil = "2.2.1" -composePlugin = "1.4.0" +composePlugin = "1.5.3" composeBom = "2023.05.01" -composeCompiler = "1.4.4" +composeCompiler = "1.5.3" coroutines = "1.6.4" dependencyAnalysis = "1.13.1" detekt = "1.21.0" junit5 = "5.8.2" jvmTarget = "11" -kotlin = "1.8.10" -ksp = "1.8.0-1.0.8" +kotlin = "1.9.10" +ksp = "1.9.10-1.0.13" mvicore = "1.2.6" ribs = "0.39.0" serialization-json = "1.5.0"