From 0dcd4fa20cf6da265020eef58678a05e3fd47486 Mon Sep 17 00:00:00 2001 From: Artur Babichev Date: Thu, 13 Jun 2024 00:08:18 +0400 Subject: [PATCH] updates: kotlin 2.0.0, etc --- android-compose-app/build.gradle.kts | 1 + build.gradle.kts | 1 + desktop-compose-app/build.gradle.kts | 1 + gradle/libs.versions.toml | 23 ++++++------ gradle/wrapper/gradle-wrapper.properties | 4 +-- ios-compose-kit/build.gradle.kts | 1 + ios-compose-kit/iosComposePod.podspec | 6 +++- iosApp/Podfile.lock | 2 +- .../Local Podspecs/iosComposePod.podspec.json | 3 ++ iosApp/Pods/Manifest.lock | 2 +- iosApp/Pods/Pods.xcodeproj/project.pbxproj | 16 ++++----- .../Pods-iosApp/Pods-iosApp.debug.xcconfig | 1 + .../Pods-iosApp/Pods-iosApp.release.xcconfig | 1 + .../iosComposePod.debug.xcconfig | 1 + .../iosComposePod.release.xcconfig | 1 + iosApp/iosApp.xcodeproj/project.pbxproj | 36 +++++++++---------- jvm-compose-test/build.gradle.kts | 1 + shared-compose-ui/build.gradle.kts | 1 + shared/shared.podspec | 6 +++- 19 files changed, 65 insertions(+), 43 deletions(-) diff --git a/android-compose-app/build.gradle.kts b/android-compose-app/build.gradle.kts index bceb7044..4ab61986 100644 --- a/android-compose-app/build.gradle.kts +++ b/android-compose-app/build.gradle.kts @@ -8,6 +8,7 @@ plugins { alias(libs.plugins.android.application) alias(libs.plugins.kotlin.android) alias(libs.plugins.compose) + alias(libs.plugins.compose.compiler) alias(libs.plugins.gms) alias(libs.plugins.crashlytics) } diff --git a/build.gradle.kts b/build.gradle.kts index 85934afa..53af94c2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,6 +6,7 @@ plugins { alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlin.cocoapods) apply false alias(libs.plugins.compose) apply false + alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.sqlDelight) apply false diff --git a/desktop-compose-app/build.gradle.kts b/desktop-compose-app/build.gradle.kts index a4602e3a..b2c19660 100644 --- a/desktop-compose-app/build.gradle.kts +++ b/desktop-compose-app/build.gradle.kts @@ -3,6 +3,7 @@ import org.jetbrains.compose.desktop.application.dsl.TargetFormat plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.compose) + alias(libs.plugins.compose.compiler) } group = "com.softartdev" diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a21c7989..5025354a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,13 +3,13 @@ compileSdk = "34" targetSdk = "34" minSdk = "21" jdk = "17" -kotlin = "1.9.24" -agp = "8.4.1" -gms = "4.4.1" +kotlin = "2.0.0" +agp = "8.4.2" +gms = "4.4.2" crashlytics = "3.0.1" -compose = "1.6.10" +compose = "1.6.11" composeCompiler = "1.5.14" -coroutines = "1.8.0" +coroutines = "1.8.1" sqlDelight = "2.0.2" androidxSqlite = "2.4.0" saferoom = "1.3.0" @@ -19,10 +19,10 @@ sqlcipherKtnPod = "1.4.2" decompose = "2.2.2-compose-experimental" koin = "3.5.3" kotlinx-serialization = "1.6.3" -kotlinx-datetime = "0.5.0" +kotlinx-datetime = "0.6.0" napier = "2.7.1" -mokoResources = "0.24.0-beta-5" -materialThemePrefs = "0.8.1" +mokoResources = "0.24.0" +materialThemePrefs = "0.8.3" androidxActivityCompose = "1.9.0" androidxComposeTest = "1.6.7" androidxCoreSplashscreen = "1.0.1" @@ -30,13 +30,13 @@ androidxLegacySupport = "1.0.0" androidxPreference = "1.2.1" androidxMultidex = "2.0.1" androidxTracing = "1.2.0" -androidxLifecycle = "2.8.0" +androidxLifecycle = "2.8.1" androidxArch = "2.2.0" androidxTestExt = "1.1.5" androidxTest = "1.5.2" androidxTestOrchestrator = "1.4.2" googleAndroidMaterial = "1.12.0" -firebase = "33.0.0" +firebase = "33.1.0" leakCanary = "2.14" junit = "4.13.2" mockito = "5.11.0" @@ -134,7 +134,7 @@ appdirs = { module = "net.harawata:appdirs", version.ref = "appdirs" } espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso" } espresso-contrib = { module = "androidx.test.espresso:espresso-contrib", version.ref = "espresso" } -espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-alpha08" } +espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.0-rc01" } espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" } desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" } @@ -147,6 +147,7 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } kotlin-cocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" } +compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } compose = { id = "org.jetbrains.compose", version.ref = "compose" } android-application = { id = "com.android.application", version.ref = "agp" } android-library = { id = "com.android.library", version.ref = "agp" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b4c3c94e..fd8e7dd3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Apr 05 16:36:26 GET 2024 +#Wed Jun 12 03:28:45 GET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/ios-compose-kit/build.gradle.kts b/ios-compose-kit/build.gradle.kts index 0a5d1a43..5ed7e4d8 100644 --- a/ios-compose-kit/build.gradle.kts +++ b/ios-compose-kit/build.gradle.kts @@ -4,6 +4,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlin.cocoapods) alias(libs.plugins.compose) + alias(libs.plugins.compose.compiler) } compose { kotlinCompilerPlugin.set(libs.versions.composeCompiler.get()) diff --git a/ios-compose-kit/iosComposePod.podspec b/ios-compose-kit/iosComposePod.podspec index 1d310f60..8f49f25a 100644 --- a/ios-compose-kit/iosComposePod.podspec +++ b/ios-compose-kit/iosComposePod.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |spec| spec.summary = 'Common UI-kit for the NoteDelight app' spec.vendored_frameworks = 'build/cocoapods/framework/iosComposeKit.framework' spec.libraries = 'c++' - spec.ios.deployment_target = '14.1' + spec.ios.deployment_target = '14.1' spec.dependency 'SQLCipher', '4.5.4' if !Dir.exist?('build/cocoapods/framework/iosComposeKit.framework') || Dir.empty?('build/cocoapods/framework/iosComposeKit.framework') @@ -22,6 +22,10 @@ Pod::Spec.new do |spec| Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" end + spec.xcconfig = { + 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO', + } + spec.pod_target_xcconfig = { 'KOTLIN_PROJECT_PATH' => ':ios-compose-kit', 'PRODUCT_MODULE_NAME' => 'iosComposeKit', diff --git a/iosApp/Podfile.lock b/iosApp/Podfile.lock index 0752fdad..bf773ca3 100644 --- a/iosApp/Podfile.lock +++ b/iosApp/Podfile.lock @@ -19,7 +19,7 @@ EXTERNAL SOURCES: :path: "../ios-compose-kit" SPEC CHECKSUMS: - iosComposePod: 990ac956967f04395c98fc0610af2a907d3a90e4 + iosComposePod: 6b1a3839625a6f599db79573723c6c16d038f9d4 SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381 PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3 diff --git a/iosApp/Pods/Local Podspecs/iosComposePod.podspec.json b/iosApp/Pods/Local Podspecs/iosComposePod.podspec.json index 52931b4b..273357e6 100644 --- a/iosApp/Pods/Local Podspecs/iosComposePod.podspec.json +++ b/iosApp/Pods/Local Podspecs/iosComposePod.podspec.json @@ -18,6 +18,9 @@ "4.5.4" ] }, + "xcconfig": { + "ENABLE_USER_SCRIPT_SANDBOXING": "NO" + }, "pod_target_xcconfig": { "KOTLIN_PROJECT_PATH": ":ios-compose-kit", "PRODUCT_MODULE_NAME": "iosComposeKit" diff --git a/iosApp/Pods/Manifest.lock b/iosApp/Pods/Manifest.lock index 0752fdad..bf773ca3 100644 --- a/iosApp/Pods/Manifest.lock +++ b/iosApp/Pods/Manifest.lock @@ -19,7 +19,7 @@ EXTERNAL SOURCES: :path: "../ios-compose-kit" SPEC CHECKSUMS: - iosComposePod: 990ac956967f04395c98fc0610af2a907d3a90e4 + iosComposePod: 6b1a3839625a6f599db79573723c6c16d038f9d4 SQLCipher: 905b145f65f349f26da9e60a19901ad24adcd381 PODFILE CHECKSUM: 0dc93a6f6109335ea8cd3f91d2c87cc8c99f04a3 diff --git a/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/iosApp/Pods/Pods.xcodeproj/project.pbxproj index 4269bd41..2fbe7530 100644 --- a/iosApp/Pods/Pods.xcodeproj/project.pbxproj +++ b/iosApp/Pods/Pods.xcodeproj/project.pbxproj @@ -17,6 +17,7 @@ 2EB6C3B1DC3EDE9F23C4C79666EF4688 /* PBXTargetDependency */, ); name = iosComposePod; + productName = iosComposePod; }; /* End PBXAggregateTarget section */ @@ -65,17 +66,17 @@ 244FC2DAA936A0B07ACEFDC74E2D54B8 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 3ECD5041F27CC497ED97A9B292B3F0BC /* SQLCipher-prefix.pch */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SQLCipher-prefix.pch"; sourceTree = ""; }; 3FF32DBA096086AD31F16EC316FF7140 /* SQLCipher.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SQLCipher.modulemap; sourceTree = ""; }; - 43907F8241745A4AA5B48578B4BDFDFB /* compose-resources */ = {isa = PBXFileReference; includeInIndex = 1; name = "compose-resources"; path = "build/compose/cocoapods/compose-resources"; sourceTree = ""; }; - 458C71A8882D0088D940108A6FF236CD /* iosComposePod.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = iosComposePod.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 43907F8241745A4AA5B48578B4BDFDFB /* compose-resources */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = folder; name = "compose-resources"; path = "build/compose/cocoapods/compose-resources"; sourceTree = ""; }; + 458C71A8882D0088D940108A6FF236CD /* iosComposePod.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; path = iosComposePod.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; 4769AA64068661236B3D136F70EEB862 /* SQLCipher-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "SQLCipher-dummy.m"; sourceTree = ""; }; 55ABB06C8A1800962A74E007E7733796 /* Pods-iosApp-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-iosApp-frameworks.sh"; sourceTree = ""; }; 6F3B5FED07117E377CFAC3D49B490F17 /* Pods-iosApp-resources.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-iosApp-resources.sh"; sourceTree = ""; }; 76A263267985B0185D85E24D40FCEE9A /* Pods-iosApp-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-Info.plist"; sourceTree = ""; }; 76D28488EA8CF5C697DFF07967A9960E /* Pods-iosApp-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-acknowledgements.plist"; sourceTree = ""; }; 952925E838A0DE4D7BDC4EE54022633D /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; AF73D48D694B262EA8800D1CA5A7A175 /* SQLCipher-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "SQLCipher-Info.plist"; sourceTree = ""; }; - B097DD7534E741D5C41838011D755842 /* Pods-iosApp */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-iosApp"; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B097DD7534E741D5C41838011D755842 /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C3B2A0B779CE31153B2C0D8A7F8DC7FE /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; C72E850B172798319EF8ADB399785CF4 /* iosComposeKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iosComposeKit.framework; path = build/cocoapods/framework/iosComposeKit.framework; sourceTree = ""; }; E2ACA340E697922AEC7D81820FD63046 /* sqlite3.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = ""; }; @@ -85,7 +86,7 @@ EFE434E808F4ACDAD53CAD2893B9A8DE /* SQLCipher.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SQLCipher.release.xcconfig; sourceTree = ""; }; F1DBEF6B264AD5F07660CCEDCB9E0F82 /* SQLCipher.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = SQLCipher.debug.xcconfig; sourceTree = ""; }; F3A43B865572C68F39872D2F7194AC56 /* iosComposePod.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = iosComposePod.release.xcconfig; sourceTree = ""; }; - FC29DBE0409C118D71AA46627E3967DF /* sqlite3.c */ = {isa = PBXFileReference; includeInIndex = 1; path = sqlite3.c; sourceTree = ""; }; + FC29DBE0409C118D71AA46627E3967DF /* sqlite3.c */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -155,7 +156,7 @@ 5818F946CC9DCBBEFC2CB7DE0E037777 /* Products */ = { isa = PBXGroup; children = ( - B097DD7534E741D5C41838011D755842 /* Pods-iosApp */, + B097DD7534E741D5C41838011D755842 /* Pods_iosApp.framework */, 1FD5F5B0E4809A3AE2ECDE142F44A6BB /* SQLCipher */, ); name = Products; @@ -248,7 +249,6 @@ EEA4CB4DFE16543549476985A542D6C6 /* common */, 4F56363B58525BCB3F7D2228EF3BFCA6 /* Support Files */, ); - name = SQLCipher; path = SQLCipher; sourceTree = ""; }; @@ -319,7 +319,7 @@ ); name = "Pods-iosApp"; productName = Pods_iosApp; - productReference = B097DD7534E741D5C41838011D755842 /* Pods-iosApp */; + productReference = B097DD7534E741D5C41838011D755842 /* Pods_iosApp.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ diff --git a/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig b/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig index 986b89ef..4f3c644b 100644 --- a/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig +++ b/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig @@ -1,4 +1,5 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO +ENABLE_USER_SCRIPT_SANDBOXING = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher" "${PODS_ROOT}/../../ios-compose-kit/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 $(inherited) SQLITE_HAS_CODEC=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher/SQLCipher.framework/Headers" $(PODS_ROOT)/SQLCipher diff --git a/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig b/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig index 986b89ef..4f3c644b 100644 --- a/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig +++ b/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig @@ -1,4 +1,5 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO +ENABLE_USER_SCRIPT_SANDBOXING = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher" "${PODS_ROOT}/../../ios-compose-kit/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 $(inherited) SQLITE_HAS_CODEC=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher/SQLCipher.framework/Headers" $(PODS_ROOT)/SQLCipher diff --git a/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.debug.xcconfig b/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.debug.xcconfig index ef86e2bc..7099d1a7 100644 --- a/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.debug.xcconfig +++ b/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.debug.xcconfig @@ -1,5 +1,6 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/iosComposePod +ENABLE_USER_SCRIPT_SANDBOXING = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher" "${PODS_ROOT}/../../ios-compose-kit/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 KOTLIN_PROJECT_PATH = :ios-compose-kit diff --git a/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.release.xcconfig b/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.release.xcconfig index ef86e2bc..7099d1a7 100644 --- a/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.release.xcconfig +++ b/iosApp/Pods/Target Support Files/iosComposePod/iosComposePod.release.xcconfig @@ -1,5 +1,6 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/iosComposePod +ENABLE_USER_SCRIPT_SANDBOXING = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/SQLCipher" "${PODS_ROOT}/../../ios-compose-kit/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 KOTLIN_PROJECT_PATH = :ios-compose-kit diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index d17af6f1..9d7df071 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -158,7 +158,7 @@ 75CF0FBEED43B2BAC7F61B5C /* Frameworks */, 7594048B29365286005183CD /* Copy moko-resources */, A798D07A9F8F09FA2C8C3203 /* [CP] Embed Pods Frameworks */, - E18A1A6173D08382371A14BE /* [CP] Copy Pods Resources */, + 0B98927A77A645700C19BF69 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -247,6 +247,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 0B98927A77A645700C19BF69 /* [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; + }; 7594048B29365286005183CD /* Copy moko-resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -304,23 +321,6 @@ shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; - E18A1A6173D08382371A14BE /* [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/jvm-compose-test/build.gradle.kts b/jvm-compose-test/build.gradle.kts index be288cda..80527d1e 100644 --- a/jvm-compose-test/build.gradle.kts +++ b/jvm-compose-test/build.gradle.kts @@ -2,6 +2,7 @@ plugins { `java-library` alias(libs.plugins.kotlin.jvm) alias(libs.plugins.compose) + alias(libs.plugins.compose.compiler) } compose { diff --git a/shared-compose-ui/build.gradle.kts b/shared-compose-ui/build.gradle.kts index b2799d01..cdea18aa 100644 --- a/shared-compose-ui/build.gradle.kts +++ b/shared-compose-ui/build.gradle.kts @@ -2,6 +2,7 @@ plugins { alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.android.library) alias(libs.plugins.compose) + alias(libs.plugins.compose.compiler) alias(libs.plugins.kotlin.serialization) } compose { diff --git a/shared/shared.podspec b/shared/shared.podspec index 2a7424d0..e18722aa 100644 --- a/shared/shared.podspec +++ b/shared/shared.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |spec| spec.summary = 'Common library for the NoteDelight app' spec.vendored_frameworks = 'build/cocoapods/framework/shared.framework' spec.libraries = 'c++' - spec.ios.deployment_target = '14.0' + spec.ios.deployment_target = '14.0' spec.dependency 'SQLCipher', '4.5.4' if !Dir.exist?('build/cocoapods/framework/shared.framework') || Dir.empty?('build/cocoapods/framework/shared.framework') @@ -22,6 +22,10 @@ Pod::Spec.new do |spec| Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)" end + spec.xcconfig = { + 'ENABLE_USER_SCRIPT_SANDBOXING' => 'NO', + } + spec.pod_target_xcconfig = { 'KOTLIN_PROJECT_PATH' => ':shared', 'PRODUCT_MODULE_NAME' => 'shared',