diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf8ca41..5fe409a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ on: jobs: ui-tests: runs-on: macos-latest - timeout-minutes: 20 + timeout-minutes: 25 steps: - uses: actions/checkout@v3 diff --git a/build.gradle.kts b/build.gradle.kts index c66ec50..17583f4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,5 @@ plugins { kotlin("multiplatform").apply(false) id("com.android.library").apply(false) + id("org.jetbrains.compose").apply(false) } diff --git a/gradle.properties b/gradle.properties index bf0d21d..361e5dc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,6 +15,6 @@ kotlin.native.cacheKind=none #Android android.useAndroidX=true -android.compileSdk=33 -android.targetSdk=33 +android.compileSdk=34 +android.targetSdk=34 android.minSdk=24 diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 94012ad..1a89fc5 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -114,6 +114,7 @@ 7555FF77242A565900829871 /* Sources */, 7555FF79242A565900829871 /* Resources */, F85CB1118929364A9C6EFABC /* Frameworks */, + 3B1353B2A151E9029E12B419 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -170,6 +171,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 3B1353B2A151E9029E12B419 /* [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/settings.gradle.kts b/settings.gradle.kts index cb9b5f6..bbc78de 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -16,7 +16,7 @@ pluginManagement { plugins { val kotlinVersion = "1.9.0" val agpVersion = "8.1.1" - val composeVersion = "1.4.3" + val composeVersion = "1.5.0" kotlin("multiplatform").version(kotlinVersion) id("com.android.library").version(agpVersion) @@ -31,4 +31,3 @@ dependencyResolutionManagement { maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") } } -include(":automotiveApp")