diff --git a/android-compose-app/build.gradle.kts b/android-compose-app/build.gradle.kts index 4ab61986..8e1c4b8e 100644 --- a/android-compose-app/build.gradle.kts +++ b/android-compose-app/build.gradle.kts @@ -23,8 +23,8 @@ android { applicationId = "com.softartdev.noteroom" minSdk = libs.versions.minSdk.get().toInt() targetSdk = libs.versions.targetSdk.get().toInt() - versionCode = 834 - versionName = "8.3.4" + versionCode = 835 + versionName = "8.3.5" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments["clearPackageData"] = "true" vectorDrawables.useSupportLibrary = true diff --git a/desktop-compose-app/build.gradle.kts b/desktop-compose-app/build.gradle.kts index b2c19660..8276a432 100644 --- a/desktop-compose-app/build.gradle.kts +++ b/desktop-compose-app/build.gradle.kts @@ -45,7 +45,7 @@ compose { nativeDistributions { targetFormats(TargetFormat.Dmg, TargetFormat.Msi, TargetFormat.Deb) packageName = "Note Delight" - packageVersion = "1.1.4" + packageVersion = "1.1.5" description = "Note app with encryption" copyright = "© 2023 SoftArtDev" macOS.iconFile.set(project.file("src/jvmMain/resources/app_icon.icns")) diff --git a/gradle.properties b/gradle.properties index a55983f2..bdce67c6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,6 +12,8 @@ kotlin.code.style=official kotlin.mpp.enableCInteropCommonization=true kotlin.mpp.androidSourceSetLayoutVersion=2 kotlin.mpp.androidGradlePluginCompatibility.nowarn=true +#kotlin.native.cacheKind=none +#compose.kotlin.native.manageCacheKind=false org.jetbrains.compose.experimental.uikit.enabled=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5025354a..26d07ebc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,10 +3,10 @@ compileSdk = "34" targetSdk = "34" minSdk = "21" jdk = "17" -kotlin = "2.0.0" -agp = "8.4.2" +kotlin = "2.0.20-Beta1" +agp = "8.5.0" gms = "4.4.2" -crashlytics = "3.0.1" +crashlytics = "3.0.2" compose = "1.6.11" composeCompiler = "1.5.14" coroutines = "1.8.1" @@ -17,31 +17,31 @@ androidSqlCipher = "4.5.4" iosSqlCipher = "4.5.4" sqlcipherKtnPod = "1.4.2" decompose = "2.2.2-compose-experimental" -koin = "3.5.3" -kotlinx-serialization = "1.6.3" +koin = "3.5.6" +kotlinx-serialization = "1.7.1" kotlinx-datetime = "0.6.0" napier = "2.7.1" -mokoResources = "0.24.0" -materialThemePrefs = "0.8.3" +mokoResources = "0.24.1" +materialThemePrefs = "0.8.5" androidxActivityCompose = "1.9.0" -androidxComposeTest = "1.6.7" +androidxComposeTest = "1.6.8" androidxCoreSplashscreen = "1.0.1" androidxLegacySupport = "1.0.0" androidxPreference = "1.2.1" androidxMultidex = "2.0.1" androidxTracing = "1.2.0" -androidxLifecycle = "2.8.1" +androidxLifecycle = "2.8.2" androidxArch = "2.2.0" -androidxTestExt = "1.1.5" -androidxTest = "1.5.2" -androidxTestOrchestrator = "1.4.2" +androidxTestExt = "1.2.1" +androidxTest = "1.6.1" +androidxTestOrchestrator = "1.5.0" googleAndroidMaterial = "1.12.0" -firebase = "33.1.0" +firebase = "33.1.1" leakCanary = "2.14" junit = "4.13.2" -mockito = "5.11.0" +mockito = "5.12.0" turbine = "1.1.0" -espresso = "3.5.1" +espresso = "3.6.1" desugar = "2.0.4" appdirs = "1.2.2" @@ -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-rc01" } +espresso-device = { module = "androidx.test.espresso:espresso-device", version = "1.0.1" } espresso-idling-resource = { module = "androidx.test.espresso:espresso-idling-resource", version.ref = "espresso" } desugar = { module = "com.android.tools:desugar_jdk_libs", version.ref = "desugar" } diff --git a/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/iosApp/Pods/Pods.xcodeproj/project.pbxproj index 2fbe7530..dc78df1d 100644 --- a/iosApp/Pods/Pods.xcodeproj/project.pbxproj +++ b/iosApp/Pods/Pods.xcodeproj/project.pbxproj @@ -14,41 +14,40 @@ 0E4FE4DB27D59D3921AB6E40F1563B7A /* [CP-User] Build iosComposePod */, ); dependencies = ( - 2EB6C3B1DC3EDE9F23C4C79666EF4688 /* PBXTargetDependency */, + B83D4F885DD70CA410CBE4D9F5616736 /* PBXTargetDependency */, ); name = iosComposePod; - productName = iosComposePod; }; /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 0BF0AC9ACD0BA0A371B14221FC53817E /* Pods-iosApp-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 015E0D7EA7331961AB63E5AFECA86BB5 /* Pods-iosApp-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 0BF0AC9ACD0BA0A371B14221FC53817E /* Pods-iosApp-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F87A626222A8D9B26448A9FEB04FD0DF /* Pods-iosApp-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 3BC2DA8B911C40FAD4FF25C229B94B23 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 952925E838A0DE4D7BDC4EE54022633D /* Foundation.framework */; }; 3C486A28B2618549A56FE9CB93610820 /* SQLCipher-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 13A2872E600E9A746D096C16F2EBCBCA /* SQLCipher-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; 481730739E8F23EC45A2D64B2927AA71 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C3B2A0B779CE31153B2C0D8A7F8DC7FE /* Security.framework */; }; 62AA43FCE46E6F7922E526782308A46E /* sqlite3.c in Sources */ = {isa = PBXBuildFile; fileRef = FC29DBE0409C118D71AA46627E3967DF /* sqlite3.c */; settings = {COMPILER_FLAGS = "-DNDEBUG -DSQLITE_HAS_CODEC -DSQLITE_TEMP_STORE=2 -DSQLITE_SOUNDEX -DSQLITE_THREADSAFE -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_STAT3 -DSQLITE_ENABLE_STAT4 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_MEMORY_MANAGEMENT -DSQLITE_ENABLE_LOAD_EXTENSION -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS4_UNICODE61 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS5 -DSQLCIPHER_CRYPTO_CC -DHAVE_USLEEP=1 -DSQLITE_MAX_VARIABLE_NUMBER=99999 -fno-objc-arc"; }; }; - 63A5F98B5DA17C01C8E5205A43C75005 /* Pods-iosApp-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = E6DB2A5F5DADA1DDE45F36B1A2D6AC16 /* Pods-iosApp-dummy.m */; }; + 63A5F98B5DA17C01C8E5205A43C75005 /* Pods-iosApp-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 54DC7F9924F99FEE67A9AD3BEE09A10C /* Pods-iosApp-dummy.m */; }; BA2A98B300F6A2F438A5439822646CB7 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = E2ACA340E697922AEC7D81820FD63046 /* sqlite3.h */; settings = {ATTRIBUTES = (Public, ); }; }; CF4DB579139E8F533154A4599B63C213 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 952925E838A0DE4D7BDC4EE54022633D /* Foundation.framework */; }; E827C96F61C81146EA5A05B7E69CA78A /* SQLCipher-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 4769AA64068661236B3D136F70EEB862 /* SQLCipher-dummy.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 7627C37550D2B50AACDA7DB0AC64F6E8 /* PBXContainerItemProxy */ = { + 2B82EA63A716387213906CA518AB4956 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = 8CD5AC086628776F77663F3736B36F45; - remoteInfo = iosComposePod; + remoteGlobalIDString = D21962D0DE148A440FADB55935BD4264; + remoteInfo = SQLCipher; }; - AE467846ED8A5338064443CE30739F0A /* PBXContainerItemProxy */ = { + CA1E7F5225CA23634E533E03E7E407EA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; - remoteGlobalIDString = D21962D0DE148A440FADB55935BD4264; - remoteInfo = SQLCipher; + remoteGlobalIDString = 8CD5AC086628776F77663F3736B36F45; + remoteInfo = iosComposePod; }; - BBA589BE5E7234AAA4ECA0830566B100 /* PBXContainerItemProxy */ = { + EC63FDCA68DEC87EB5A1B097C5A4A3D6 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = BFDFE7DC352907FC980B868725387E98 /* Project object */; proxyType = 1; @@ -58,35 +57,33 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 015E0D7EA7331961AB63E5AFECA86BB5 /* Pods-iosApp-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-iosApp-umbrella.h"; sourceTree = ""; }; - 056CC6A06008B475FFB4DB8426C39819 /* iosComposePod.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = iosComposePod.debug.xcconfig; sourceTree = ""; }; - 11C9B998CE0869936AE6BE69270DAAC9 /* Pods-iosApp.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-iosApp.modulemap"; sourceTree = ""; }; + 0187F135D5F61750CD24C3E04B6E8B64 /* Pods-iosApp-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-iosApp-frameworks.sh"; sourceTree = ""; }; + 0873377E3857ADC44E919597C03BFA43 /* iosComposeKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iosComposeKit.framework; path = build/cocoapods/framework/iosComposeKit.framework; sourceTree = ""; }; 13A2872E600E9A746D096C16F2EBCBCA /* SQLCipher-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "SQLCipher-umbrella.h"; sourceTree = ""; }; 1FD5F5B0E4809A3AE2ECDE142F44A6BB /* SQLCipher */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = SQLCipher; path = SQLCipher.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 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 = ""; }; + 3F64BADB16C311E9D09DAD0116F684F4 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 3FF32DBA096086AD31F16EC316FF7140 /* SQLCipher.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = SQLCipher.modulemap; sourceTree = ""; }; - 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 = ""; }; + 54DC7F9924F99FEE67A9AD3BEE09A10C /* Pods-iosApp-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-iosApp-dummy.m"; sourceTree = ""; }; + 5AC974169B09D4545F741E9A2147610E /* Pods-iosApp-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-Info.plist"; sourceTree = ""; }; + 83AEBFFCA34953AFE8F7D4C0EE78427A /* iosComposePod.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = iosComposePod.debug.xcconfig; sourceTree = ""; }; + 878F5B1E91E548FCF1BC50A0BB157712 /* iosComposePod.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = iosComposePod.release.xcconfig; sourceTree = ""; }; + 8B524AABE529FB8A2D151B05321336E0 /* Pods-iosApp.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-iosApp.modulemap"; 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; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; + 9BB0B8B698D4C35D4F9A07EF70910170 /* Pods-iosApp-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-acknowledgements.plist"; sourceTree = ""; }; + 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; }; + 9F1FFC8B10F4D7D4F37606E8959B3F29 /* Pods-iosApp-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-iosApp-acknowledgements.markdown"; sourceTree = ""; }; + 9FECCB5AFF87D121F15BA01E683C7932 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.release.xcconfig"; sourceTree = ""; }; AF73D48D694B262EA8800D1CA5A7A175 /* SQLCipher-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "SQLCipher-Info.plist"; sourceTree = ""; }; - B097DD7534E741D5C41838011D755842 /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B097DD7534E741D5C41838011D755842 /* Pods-iosApp */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-iosApp"; 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 = ""; }; + CEEC2E1232AEB6ACA3AC36F9342EFBDD /* iosComposePod.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = iosComposePod.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; E2ACA340E697922AEC7D81820FD63046 /* sqlite3.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = sqlite3.h; sourceTree = ""; }; - E462E23B3674BF94EAB1504D506F2803 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; - E4C923318724794E3CC670804C2D6A6B /* Pods-iosApp-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-iosApp-acknowledgements.markdown"; sourceTree = ""; }; - E6DB2A5F5DADA1DDE45F36B1A2D6AC16 /* Pods-iosApp-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-iosApp-dummy.m"; sourceTree = ""; }; 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; lastKnownFileType = sourcecode.c.c; path = sqlite3.c; sourceTree = ""; }; + F87A626222A8D9B26448A9FEB04FD0DF /* Pods-iosApp-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-iosApp-umbrella.h"; sourceTree = ""; }; + FC29DBE0409C118D71AA46627E3967DF /* sqlite3.c */ = {isa = PBXFileReference; includeInIndex = 1; path = sqlite3.c; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -110,6 +107,22 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0C6E05A4FEDEE0D095764C93447C807A /* Frameworks */ = { + isa = PBXGroup; + children = ( + 0873377E3857ADC44E919597C03BFA43 /* iosComposeKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 11C970DEAE48C6D0282DFE54684F53F1 /* Targets Support Files */ = { + isa = PBXGroup; + children = ( + 52A898E555C2DBD7D25A7E44754C3FC6 /* Pods-iosApp */, + ); + name = "Targets Support Files"; + sourceTree = ""; + }; 1628BF05B4CAFDCC3549A101F5A10A17 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -118,12 +131,12 @@ name = Frameworks; sourceTree = ""; }; - 1A3D275F3BC4A7810FB3728EEF569A25 /* Frameworks */ = { + 2863FB413E6D4B726B6D4BE69D99BE6A /* Pod */ = { isa = PBXGroup; children = ( - C72E850B172798319EF8ADB399785CF4 /* iosComposeKit.framework */, + CEEC2E1232AEB6ACA3AC36F9342EFBDD /* iosComposePod.podspec */, ); - name = Frameworks; + name = Pod; sourceTree = ""; }; 4F56363B58525BCB3F7D2228EF3BFCA6 /* Support Files */ = { @@ -141,114 +154,97 @@ path = "../Target Support Files/SQLCipher"; sourceTree = ""; }; - 55BF10C492F0787F6F31FDE71C5109DF /* iosComposePod */ = { + 52A898E555C2DBD7D25A7E44754C3FC6 /* Pods-iosApp */ = { isa = PBXGroup; children = ( - 43907F8241745A4AA5B48578B4BDFDFB /* compose-resources */, - 1A3D275F3BC4A7810FB3728EEF569A25 /* Frameworks */, - ABD794A40111A749E5B96FD96B354F3F /* Pod */, - A5449CB1139726204A039B3607B5400F /* Support Files */, + 8B524AABE529FB8A2D151B05321336E0 /* Pods-iosApp.modulemap */, + 9F1FFC8B10F4D7D4F37606E8959B3F29 /* Pods-iosApp-acknowledgements.markdown */, + 9BB0B8B698D4C35D4F9A07EF70910170 /* Pods-iosApp-acknowledgements.plist */, + 54DC7F9924F99FEE67A9AD3BEE09A10C /* Pods-iosApp-dummy.m */, + 0187F135D5F61750CD24C3E04B6E8B64 /* Pods-iosApp-frameworks.sh */, + 5AC974169B09D4545F741E9A2147610E /* Pods-iosApp-Info.plist */, + F87A626222A8D9B26448A9FEB04FD0DF /* Pods-iosApp-umbrella.h */, + 3F64BADB16C311E9D09DAD0116F684F4 /* Pods-iosApp.debug.xcconfig */, + 9FECCB5AFF87D121F15BA01E683C7932 /* Pods-iosApp.release.xcconfig */, ); - name = iosComposePod; - path = "../../ios-compose-kit"; + name = "Pods-iosApp"; + path = "Target Support Files/Pods-iosApp"; sourceTree = ""; }; 5818F946CC9DCBBEFC2CB7DE0E037777 /* Products */ = { isa = PBXGroup; children = ( - B097DD7534E741D5C41838011D755842 /* Pods_iosApp.framework */, + B097DD7534E741D5C41838011D755842 /* Pods-iosApp */, 1FD5F5B0E4809A3AE2ECDE142F44A6BB /* SQLCipher */, ); name = Products; sourceTree = ""; }; - 6746CCF30CAE34654B19DDA6B383D05D /* Pods */ = { + 665F49DF961ED93D1ACE0D16BA2DE7A0 /* Support Files */ = { isa = PBXGroup; children = ( - E74569A9C027A82A021AAB6F29D8BE3B /* SQLCipher */, + 83AEBFFCA34953AFE8F7D4C0EE78427A /* iosComposePod.debug.xcconfig */, + 878F5B1E91E548FCF1BC50A0BB157712 /* iosComposePod.release.xcconfig */, ); - name = Pods; - sourceTree = ""; - }; - 7CE426AC267333500FABE7BA0A5A42A0 /* iOS */ = { - isa = PBXGroup; - children = ( - 952925E838A0DE4D7BDC4EE54022633D /* Foundation.framework */, - C3B2A0B779CE31153B2C0D8A7F8DC7FE /* Security.framework */, - ); - name = iOS; + name = "Support Files"; + path = "../iosApp/Pods/Target Support Files/iosComposePod"; sourceTree = ""; }; - A5449CB1139726204A039B3607B5400F /* Support Files */ = { + 6746CCF30CAE34654B19DDA6B383D05D /* Pods */ = { isa = PBXGroup; children = ( - 056CC6A06008B475FFB4DB8426C39819 /* iosComposePod.debug.xcconfig */, - F3A43B865572C68F39872D2F7194AC56 /* iosComposePod.release.xcconfig */, + E74569A9C027A82A021AAB6F29D8BE3B /* SQLCipher */, ); - name = "Support Files"; - path = "../iosApp/Pods/Target Support Files/iosComposePod"; + name = Pods; sourceTree = ""; }; - ABD794A40111A749E5B96FD96B354F3F /* Pod */ = { + 74312BEF1C762D20E36E394E8AAF8D9C /* Development Pods */ = { isa = PBXGroup; children = ( - 458C71A8882D0088D940108A6FF236CD /* iosComposePod.podspec */, + 787250B755F418B1E823F0A4C48F32FA /* iosComposePod */, ); - name = Pod; + name = "Development Pods"; sourceTree = ""; }; - BA6B7BC2729F657E9D3682E55CA6E980 /* Pods-iosApp */ = { + 787250B755F418B1E823F0A4C48F32FA /* iosComposePod */ = { isa = PBXGroup; children = ( - 11C9B998CE0869936AE6BE69270DAAC9 /* Pods-iosApp.modulemap */, - E4C923318724794E3CC670804C2D6A6B /* Pods-iosApp-acknowledgements.markdown */, - 76D28488EA8CF5C697DFF07967A9960E /* Pods-iosApp-acknowledgements.plist */, - E6DB2A5F5DADA1DDE45F36B1A2D6AC16 /* Pods-iosApp-dummy.m */, - 55ABB06C8A1800962A74E007E7733796 /* Pods-iosApp-frameworks.sh */, - 76A263267985B0185D85E24D40FCEE9A /* Pods-iosApp-Info.plist */, - 6F3B5FED07117E377CFAC3D49B490F17 /* Pods-iosApp-resources.sh */, - 015E0D7EA7331961AB63E5AFECA86BB5 /* Pods-iosApp-umbrella.h */, - E462E23B3674BF94EAB1504D506F2803 /* Pods-iosApp.debug.xcconfig */, - 244FC2DAA936A0B07ACEFDC74E2D54B8 /* Pods-iosApp.release.xcconfig */, + 0C6E05A4FEDEE0D095764C93447C807A /* Frameworks */, + 2863FB413E6D4B726B6D4BE69D99BE6A /* Pod */, + 665F49DF961ED93D1ACE0D16BA2DE7A0 /* Support Files */, ); - name = "Pods-iosApp"; - path = "Target Support Files/Pods-iosApp"; + name = iosComposePod; + path = "../../ios-compose-kit"; sourceTree = ""; }; - BEA9DB10AD5229A07D3458D6147B3990 /* Development Pods */ = { + 7CE426AC267333500FABE7BA0A5A42A0 /* iOS */ = { isa = PBXGroup; children = ( - 55BF10C492F0787F6F31FDE71C5109DF /* iosComposePod */, + 952925E838A0DE4D7BDC4EE54022633D /* Foundation.framework */, + C3B2A0B779CE31153B2C0D8A7F8DC7FE /* Security.framework */, ); - name = "Development Pods"; + name = iOS; sourceTree = ""; }; CF1408CF629C7361332E53B88F7BD30C = { isa = PBXGroup; children = ( 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */, - BEA9DB10AD5229A07D3458D6147B3990 /* Development Pods */, + 74312BEF1C762D20E36E394E8AAF8D9C /* Development Pods */, 1628BF05B4CAFDCC3549A101F5A10A17 /* Frameworks */, 6746CCF30CAE34654B19DDA6B383D05D /* Pods */, 5818F946CC9DCBBEFC2CB7DE0E037777 /* Products */, - D456857FB6E5BC3266BEC21401D60DB5 /* Targets Support Files */, + 11C970DEAE48C6D0282DFE54684F53F1 /* Targets Support Files */, ); sourceTree = ""; }; - D456857FB6E5BC3266BEC21401D60DB5 /* Targets Support Files */ = { - isa = PBXGroup; - children = ( - BA6B7BC2729F657E9D3682E55CA6E980 /* Pods-iosApp */, - ); - name = "Targets Support Files"; - sourceTree = ""; - }; E74569A9C027A82A021AAB6F29D8BE3B /* SQLCipher */ = { isa = PBXGroup; children = ( EEA4CB4DFE16543549476985A542D6C6 /* common */, 4F56363B58525BCB3F7D2228EF3BFCA6 /* Support Files */, ); + name = SQLCipher; path = SQLCipher; sourceTree = ""; }; @@ -314,12 +310,12 @@ buildRules = ( ); dependencies = ( - 57BF9787BB098C6F14E266342C04EE27 /* PBXTargetDependency */, - 6112B3F4F8AFA28E725A3EB18B299B06 /* PBXTargetDependency */, + 0D4C4E291864EBC518E3B0902D2F7CD6 /* PBXTargetDependency */, + 5235EBFBF7382849292F34FF910D3A0C /* PBXTargetDependency */, ); name = "Pods-iosApp"; productName = Pods_iosApp; - productReference = B097DD7534E741D5C41838011D755842 /* Pods_iosApp.framework */; + productReference = B097DD7534E741D5C41838011D755842 /* Pods-iosApp */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -402,30 +398,30 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 2EB6C3B1DC3EDE9F23C4C79666EF4688 /* PBXTargetDependency */ = { + 0D4C4E291864EBC518E3B0902D2F7CD6 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SQLCipher; target = D21962D0DE148A440FADB55935BD4264 /* SQLCipher */; - targetProxy = AE467846ED8A5338064443CE30739F0A /* PBXContainerItemProxy */; + targetProxy = 2B82EA63A716387213906CA518AB4956 /* PBXContainerItemProxy */; }; - 57BF9787BB098C6F14E266342C04EE27 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = SQLCipher; - target = D21962D0DE148A440FADB55935BD4264 /* SQLCipher */; - targetProxy = BBA589BE5E7234AAA4ECA0830566B100 /* PBXContainerItemProxy */; - }; - 6112B3F4F8AFA28E725A3EB18B299B06 /* PBXTargetDependency */ = { + 5235EBFBF7382849292F34FF910D3A0C /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = iosComposePod; target = 8CD5AC086628776F77663F3736B36F45 /* iosComposePod */; - targetProxy = 7627C37550D2B50AACDA7DB0AC64F6E8 /* PBXContainerItemProxy */; + targetProxy = CA1E7F5225CA23634E533E03E7E407EA /* PBXContainerItemProxy */; + }; + B83D4F885DD70CA410CBE4D9F5616736 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = SQLCipher; + target = D21962D0DE148A440FADB55935BD4264 /* SQLCipher */; + targetProxy = EC63FDCA68DEC87EB5A1B097C5A4A3D6 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ 052D17EECF4180EC4608BC2A6F212303 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F3A43B865572C68F39872D2F7194AC56 /* iosComposePod.release.xcconfig */; + baseConfigurationReference = 878F5B1E91E548FCF1BC50A0BB157712 /* iosComposePod.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -505,7 +501,7 @@ }; 670E43FB90517C126953C6A6DB2147B3 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 056CC6A06008B475FFB4DB8426C39819 /* iosComposePod.debug.xcconfig */; + baseConfigurationReference = 83AEBFFCA34953AFE8F7D4C0EE78427A /* iosComposePod.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -588,7 +584,7 @@ }; CC7C1D1A3B5075BD66875E59A070E404 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 244FC2DAA936A0B07ACEFDC74E2D54B8 /* Pods-iosApp.release.xcconfig */; + baseConfigurationReference = 9FECCB5AFF87D121F15BA01E683C7932 /* Pods-iosApp.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; @@ -626,7 +622,7 @@ }; D2C52C24E863F310EA4C30647BF8BA35 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E462E23B3674BF94EAB1504D506F2803 /* Pods-iosApp.debug.xcconfig */; + baseConfigurationReference = 3F64BADB16C311E9D09DAD0116F684F4 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 9d7df071..bd205189 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -158,7 +158,6 @@ 75CF0FBEED43B2BAC7F61B5C /* Frameworks */, 7594048B29365286005183CD /* Copy moko-resources */, A798D07A9F8F09FA2C8C3203 /* [CP] Embed Pods Frameworks */, - 0B98927A77A645700C19BF69 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -247,23 +246,6 @@ /* 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;