From d12c9ffd4ba0342843eae540623bcfcd93dc5ab5 Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Wed, 3 Aug 2022 01:11:01 +0300 Subject: [PATCH 1/5] [#825] move Res to embedAndSignAppleFrameworkForXcode (#879) --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/testing.yml | 2 +- ios/CCC.xcodeproj/project.pbxproj | 16 +++++++++++++++- ios/CCC.xcworkspace/contents.xcworkspacedata | 2 +- ios/Podfile.lock | 11 +++-------- ios/podfile | 1 - res/.gitignore | 1 - res/build.gradle.kts | 18 +++++++----------- 9 files changed, 29 insertions(+), 26 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7b0eb82b22..0f2da7ed6d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,7 +118,7 @@ jobs: - name: Install Cocoapods run: | - ./gradlew client:podGenIOS res:podGenIOS --parallel + ./gradlew client:podGenIOS --parallel cd ios/CCC pod install --repo-update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7d74dbe4b6..4a5482f31a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -208,7 +208,7 @@ jobs: - name: Install Cocoapods run: | - ./gradlew client:podGenIOS res:podGenIOS --parallel + ./gradlew client:podGenIOS --parallel cd ios/CCC pod install --repo-update diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 86f59d33da..e0424ebb8e 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -106,7 +106,7 @@ jobs: - name: Install Cocoapods run: | - ./gradlew client:podGenIOS res:podGenIOS --parallel + ./gradlew client:podGenIOS --parallel cd ios/CCC pod install --repo-update diff --git a/ios/CCC.xcodeproj/project.pbxproj b/ios/CCC.xcodeproj/project.pbxproj index aa6f332b41..4bcdf4a639 100644 --- a/ios/CCC.xcodeproj/project.pbxproj +++ b/ios/CCC.xcodeproj/project.pbxproj @@ -423,7 +423,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n swiftlint --no-cache\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\ncd \"$SRCROOT/..\"\n\n\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../\" :res:copyFrameworkResourcesToApp \\\n -Pmoko.resources.PLATFORM_NAME=$PLATFORM_NAME \\\n -Pmoko.resources.CONFIGURATION=$CONFIGURATION \\\n -Pmoko.resources.BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR \\\n -Pmoko.resources.CONTENTS_FOLDER_PATH=$CONTENTS_FOLDER_PATH\n"; + shellScript = "if which swiftlint >/dev/null; then\n swiftlint --no-cache\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\ncd \"$SRCROOT/..\"\n\n./gradlew :res:embedAndSignAppleFrameworkForXcode\n\n\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../\" :res:copyFrameworkResourcesToApp \\\n -Pmoko.resources.PLATFORM_NAME=$PLATFORM_NAME \\\n -Pmoko.resources.CONFIGURATION=$CONFIGURATION \\\n -Pmoko.resources.BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR \\\n -Pmoko.resources.CONTENTS_FOLDER_PATH=$CONTENTS_FOLDER_PATH\n"; }; ABAB7B6EBA5C48167F3A008C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -623,6 +623,11 @@ DEVELOPMENT_ASSET_PATHS = "\"CCC/Preview Content\""; DEVELOPMENT_TEAM = Q5WB95G58X; ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_ROOT}/../../client/build/cocoapods/framework\"", + "$(SRCROOT)/../res/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; INFOPLIST_FILE = CCC/Resources/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( @@ -632,6 +637,8 @@ OTHER_LDFLAGS = ( "$(inherited)", "-lsqlite3", + "-framework", + res, ); PRODUCT_BUNDLE_IDENTIFIER = com.oztechan.ccc; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -649,6 +656,11 @@ DEVELOPMENT_ASSET_PATHS = "\"CCC/Preview Content\""; DEVELOPMENT_TEAM = Q5WB95G58X; ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "\"${PODS_ROOT}/../../client/build/cocoapods/framework\"", + "$(SRCROOT)/../res/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); INFOPLIST_FILE = CCC/Resources/Info.plist; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -657,6 +669,8 @@ OTHER_LDFLAGS = ( "$(inherited)", "-lsqlite3", + "-framework", + res, ); PRODUCT_BUNDLE_IDENTIFIER = com.oztechan.ccc; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ios/CCC.xcworkspace/contents.xcworkspacedata b/ios/CCC.xcworkspace/contents.xcworkspacedata index f963c7e776..b65973676e 100644 --- a/ios/CCC.xcworkspace/contents.xcworkspacedata +++ b/ios/CCC.xcworkspace/contents.xcworkspacedata @@ -19,7 +19,7 @@ + name = "Res"> diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 80ecf4a23d..7977af0ed8 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,21 +1,16 @@ PODS: - - client (0.0.1467) - - res (0.0.1467) + - client (0.0.1470) DEPENDENCIES: - client (from `../client/client.podspec`) - - res (from `../res/res.podspec`) EXTERNAL SOURCES: client: :path: "../client/client.podspec" - res: - :path: "../res/res.podspec" SPEC CHECKSUMS: - client: 8d21ee372727cf9fe8165b6d12502d4185504385 - res: 961330d930bf80da98041d4535cc376dbb828fd6 + client: 31e615b256dcdb46eab09be788a4f2d115023c14 -PODFILE CHECKSUM: 3af52908f4dea1100643ca962006066a8db38086 +PODFILE CHECKSUM: 99ba58e6824fe13acd0e4f97d5a427b7f46c0e94 COCOAPODS: 1.11.2 diff --git a/ios/podfile b/ios/podfile index 8232bb7aa1..61bcbd01ec 100644 --- a/ios/podfile +++ b/ios/podfile @@ -7,6 +7,5 @@ target 'CCC' do # Pods for CCC pod 'client', :path => '../client/client.podspec' - pod 'res', :path => '../res/res.podspec' end diff --git a/res/.gitignore b/res/.gitignore index cbad29eab8..91ea7410d8 100644 --- a/res/.gitignore +++ b/res/.gitignore @@ -1,3 +1,2 @@ build .gradle -res.podspec \ No newline at end of file diff --git a/res/build.gradle.kts b/res/build.gradle.kts index 642c2f58bc..c8eaa49d54 100644 --- a/res/build.gradle.kts +++ b/res/build.gradle.kts @@ -1,7 +1,6 @@ plugins { with(Dependencies.Plugins) { kotlin(MULTIPLATFORM) - kotlin(COCOAPODS) id(ANDROID_LIB) id(MOKO_RESOURCES) } @@ -12,16 +11,14 @@ version = ProjectSettings.getVersionName(project) kotlin { android() - iosX64() - iosArm64() - iosSimulatorArm64() - - cocoapods { - summary = "CCC" - homepage = "https://github.com/CurrencyConverterCalculator/CCC" - ios.deploymentTarget = "14.0" - framework { + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { + it.binaries.framework { baseName = "Res" + isStatic = true } } @@ -33,7 +30,6 @@ kotlin { } } val commonTest by getting - val androidMain by getting val androidTest by getting From d5c253bceed317a3901bdb9e223bc5eb42f6dc50 Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Wed, 3 Aug 2022 09:23:36 +0300 Subject: [PATCH 2/5] [#880] move Client to embedAndSignAppleFrameworkForXcode (#881) --- .github/workflows/main.yml | 1 - .github/workflows/release.yml | 1 - .github/workflows/testing.yml | 1 - client/.gitignore | 1 - client/build.gradle.kts | 17 +++++++---------- ios/CCC.xcodeproj/project.pbxproj | 12 +++++++++--- ios/Podfile.lock | 15 +-------------- ios/podfile | 1 - 8 files changed, 17 insertions(+), 32 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f2da7ed6d..81f57f799b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -118,7 +118,6 @@ jobs: - name: Install Cocoapods run: | - ./gradlew client:podGenIOS --parallel cd ios/CCC pod install --repo-update diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a5482f31a..b7bc5ed9cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -208,7 +208,6 @@ jobs: - name: Install Cocoapods run: | - ./gradlew client:podGenIOS --parallel cd ios/CCC pod install --repo-update diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index e0424ebb8e..f5bf4e669a 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -106,7 +106,6 @@ jobs: - name: Install Cocoapods run: | - ./gradlew client:podGenIOS --parallel cd ios/CCC pod install --repo-update diff --git a/client/.gitignore b/client/.gitignore index d06cfb3fb9..91ea7410d8 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -1,3 +1,2 @@ build .gradle -client.podspec \ No newline at end of file diff --git a/client/build.gradle.kts b/client/build.gradle.kts index 399729ee94..6f4d40196d 100644 --- a/client/build.gradle.kts +++ b/client/build.gradle.kts @@ -10,7 +10,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { with(Dependencies.Plugins) { kotlin(MULTIPLATFORM) - kotlin(COCOAPODS) id(ANDROID_LIB) id(SQL_DELIGHT) id(BUILD_KONFIG) @@ -23,16 +22,14 @@ version = ProjectSettings.getVersionName(project) kotlin { android() - iosX64() - iosArm64() - iosSimulatorArm64() - - cocoapods { - summary = "CCC" - homepage = "https://github.com/CurrencyConverterCalculator/CCC" - ios.deploymentTarget = "14.0" - framework { + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { + it.binaries.framework { baseName = "Client" + isStatic = true } } diff --git a/ios/CCC.xcodeproj/project.pbxproj b/ios/CCC.xcodeproj/project.pbxproj index 4bcdf4a639..2eed392107 100644 --- a/ios/CCC.xcodeproj/project.pbxproj +++ b/ios/CCC.xcodeproj/project.pbxproj @@ -423,7 +423,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if which swiftlint >/dev/null; then\n swiftlint --no-cache\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\ncd \"$SRCROOT/..\"\n\n./gradlew :res:embedAndSignAppleFrameworkForXcode\n\n\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../\" :res:copyFrameworkResourcesToApp \\\n -Pmoko.resources.PLATFORM_NAME=$PLATFORM_NAME \\\n -Pmoko.resources.CONFIGURATION=$CONFIGURATION \\\n -Pmoko.resources.BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR \\\n -Pmoko.resources.CONTENTS_FOLDER_PATH=$CONTENTS_FOLDER_PATH\n"; + shellScript = "if which swiftlint >/dev/null; then\n swiftlint --no-cache\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\ncd \"$SRCROOT/..\"\n\n./gradlew :client:embedAndSignAppleFrameworkForXcode\n\n./gradlew :res:embedAndSignAppleFrameworkForXcode\n\n\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../\" :res:copyFrameworkResourcesToApp \\\n -Pmoko.resources.PLATFORM_NAME=$PLATFORM_NAME \\\n -Pmoko.resources.CONFIGURATION=$CONFIGURATION \\\n -Pmoko.resources.BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR \\\n -Pmoko.resources.CONTENTS_FOLDER_PATH=$CONTENTS_FOLDER_PATH\n"; }; ABAB7B6EBA5C48167F3A008C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; @@ -625,7 +625,7 @@ ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/../../client/build/cocoapods/framework\"", + "$(SRCROOT)/../client/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", "$(SRCROOT)/../res/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", ); GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -638,7 +638,10 @@ "$(inherited)", "-lsqlite3", "-framework", + client, + "-framework", res, + "-ObjC", ); PRODUCT_BUNDLE_IDENTIFIER = com.oztechan.ccc; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -658,7 +661,7 @@ ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", - "\"${PODS_ROOT}/../../client/build/cocoapods/framework\"", + "$(SRCROOT)/../client/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", "$(SRCROOT)/../res/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", ); INFOPLIST_FILE = CCC/Resources/Info.plist; @@ -670,7 +673,10 @@ "$(inherited)", "-lsqlite3", "-framework", + client, + "-framework", res, + "-ObjC", ); PRODUCT_BUNDLE_IDENTIFIER = com.oztechan.ccc; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 7977af0ed8..938d819c05 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,16 +1,3 @@ -PODS: - - client (0.0.1470) - -DEPENDENCIES: - - client (from `../client/client.podspec`) - -EXTERNAL SOURCES: - client: - :path: "../client/client.podspec" - -SPEC CHECKSUMS: - client: 31e615b256dcdb46eab09be788a4f2d115023c14 - -PODFILE CHECKSUM: 99ba58e6824fe13acd0e4f97d5a427b7f46c0e94 +PODFILE CHECKSUM: 86a9ccd4a520dbd3e79496b0551b16856454211d COCOAPODS: 1.11.2 diff --git a/ios/podfile b/ios/podfile index 61bcbd01ec..805a8d2897 100644 --- a/ios/podfile +++ b/ios/podfile @@ -6,6 +6,5 @@ target 'CCC' do use_frameworks! # Pods for CCC - pod 'client', :path => '../client/client.podspec' end From 050c8dd1f6d35cb925e7f8097c95a863cd6533ba Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Wed, 3 Aug 2022 10:42:39 +0300 Subject: [PATCH 3/5] [#882] remove cocoapods (#883) --- .github/workflows/main.yml | 5 -- .github/workflows/release.yml | 5 -- .github/workflows/testing.yml | 5 -- buildSrc/src/main/kotlin/Dependencies.kt | 1 - ios/.gitignore | 1 - ios/.swiftlint.yml | 2 - ios/CCC.xcodeproj/project.pbxproj | 49 -------------------- ios/CCC.xcworkspace/contents.xcworkspacedata | 3 -- ios/Podfile.lock | 3 -- ios/podfile | 10 ---- 10 files changed, 84 deletions(-) delete mode 100644 ios/.swiftlint.yml delete mode 100644 ios/Podfile.lock delete mode 100644 ios/podfile diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81f57f799b..cb914edeea 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -116,11 +116,6 @@ jobs: with: java-version: 11 - - name: Install Cocoapods - run: | - cd ios/CCC - pod install --repo-update - - name: Build uses: maierj/fastlane-action@v2.2.0 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b7bc5ed9cc..e9a7dbfc2e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -206,11 +206,6 @@ jobs: echo "${{ secrets.IOS_GPG_RELEASE_XCCONFIG }}" > Release.xcconfig.asc gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release.xcconfig - - name: Install Cocoapods - run: | - cd ios/CCC - pod install --repo-update - - name: Publish uses: maierj/fastlane-action@v2.2.0 with: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index f5bf4e669a..d58e820a13 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -104,11 +104,6 @@ jobs: echo "${{ secrets.IOS_GPG_RELEASE_XCCONFIG }}" > Release.xcconfig.asc gpg -d --passphrase "${{ secrets.SECRET_PASSWORD }}" --batch Release.xcconfig.asc > ios/CCC/Resources/Release.xcconfig - - name: Install Cocoapods - run: | - cd ios/CCC - pod install --repo-update - - name: Distrubute uses: maierj/fastlane-action@v2.2.0 with: diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index b4e090c95e..2f4bb41aea 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -83,7 +83,6 @@ object Dependencies { const val ANDROID = "android" const val ANDROID_APP = "com.android.application" const val ANDROID_LIB = "com.android.library" - const val COCOAPODS = "native.cocoapods" const val BUILD_KONFIG = "com.codingfeline.buildkonfig" const val CRASHLYTICS = "com.google.firebase.crashlytics" const val GOOGLE_SERVICES = "com.google.gms.google-services" diff --git a/ios/.gitignore b/ios/.gitignore index 4240056669..4233f8f44f 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -1,4 +1,3 @@ -Pods/ build CCC/Resources/GoogleService-Info.plist CCC/Resources/Release.xcconfig diff --git a/ios/.swiftlint.yml b/ios/.swiftlint.yml deleted file mode 100644 index 8d6f864025..0000000000 --- a/ios/.swiftlint.yml +++ /dev/null @@ -1,2 +0,0 @@ -excluded: - - Pods diff --git a/ios/CCC.xcodeproj/project.pbxproj b/ios/CCC.xcodeproj/project.pbxproj index 2eed392107..af60f478b9 100644 --- a/ios/CCC.xcodeproj/project.pbxproj +++ b/ios/CCC.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 15A796074B10DEA83142F40F /* Pods_CCC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 341CA58575E08166F616E331 /* Pods_CCC.framework */; }; 5C039FD625C1B705008350A3 /* FormProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C039FD525C1B705008350A3 /* FormProgressView.swift */; }; 5C17581A25BC74BD00D16BD9 /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C17581925BC74BD00D16BD9 /* SettingsView.swift */; }; 5C314CBE25BA0AC0007B22D8 /* CurrenciesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5C314CBD25BA0AC0007B22D8 /* CurrenciesView.swift */; }; @@ -69,7 +68,6 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 341CA58575E08166F616E331 /* Pods_CCC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CCC.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5C039FD525C1B705008350A3 /* FormProgressView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormProgressView.swift; sourceTree = ""; }; 5C17581925BC74BD00D16BD9 /* SettingsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = ""; }; 5C314CBD25BA0AC0007B22D8 /* CurrenciesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CurrenciesView.swift; sourceTree = ""; }; @@ -114,8 +112,6 @@ 7555FF84242A565B00829871 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 7555FF87242A565B00829871 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - CB3F2CB9B5D0920F890DA73A /* Pods-CCC.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CCC.debug.xcconfig"; path = "Target Support Files/Pods-CCC/Pods-CCC.debug.xcconfig"; sourceTree = ""; }; - FF1FD2425A9A57DA8C484F81 /* Pods-CCC.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CCC.release.xcconfig"; path = "Target Support Files/Pods-CCC/Pods-CCC.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -124,7 +120,6 @@ buildActionMask = 2147483647; files = ( 5C3EB6D828775AFF001E822A /* GoogleMobileAds in Frameworks */, - 15A796074B10DEA83142F40F /* Pods_CCC.framework in Frameworks */, 5C3EB6D528775993001E822A /* SwiftMessages in Frameworks */, 5C3EB6DD28775F12001E822A /* FirebaseCrashlytics in Frameworks */, 5C3EB6DB28775F12001E822A /* FirebaseAnalytics in Frameworks */, @@ -273,8 +268,6 @@ children = ( 7555FF7D242A565900829871 /* CCC */, 7555FF7C242A565900829871 /* Products */, - 7555FFB0242A642200829871 /* Frameworks */, - E1A41654A700B91B0C52E7DE /* Pods */, ); sourceTree = ""; }; @@ -307,23 +300,6 @@ path = "Preview Content"; sourceTree = ""; }; - 7555FFB0242A642200829871 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 341CA58575E08166F616E331 /* Pods_CCC.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - E1A41654A700B91B0C52E7DE /* Pods */ = { - isa = PBXGroup; - children = ( - CB3F2CB9B5D0920F890DA73A /* Pods-CCC.debug.xcconfig */, - FF1FD2425A9A57DA8C484F81 /* Pods-CCC.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -331,7 +307,6 @@ isa = PBXNativeTarget; buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "CCC" */; buildPhases = ( - ABAB7B6EBA5C48167F3A008C /* [CP] Check Pods Manifest.lock */, 7555FFB5242A651A00829871 /* ShellScript */, 7555FF77242A565900829871 /* Sources */, 7555FF78242A565900829871 /* Frameworks */, @@ -425,28 +400,6 @@ shellPath = /bin/sh; shellScript = "if which swiftlint >/dev/null; then\n swiftlint --no-cache\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\ncd \"$SRCROOT/..\"\n\n./gradlew :client:embedAndSignAppleFrameworkForXcode\n\n./gradlew :res:embedAndSignAppleFrameworkForXcode\n\n\"$SRCROOT/../gradlew\" -p \"$SRCROOT/../\" :res:copyFrameworkResourcesToApp \\\n -Pmoko.resources.PLATFORM_NAME=$PLATFORM_NAME \\\n -Pmoko.resources.CONFIGURATION=$CONFIGURATION \\\n -Pmoko.resources.BUILT_PRODUCTS_DIR=$BUILT_PRODUCTS_DIR \\\n -Pmoko.resources.CONTENTS_FOLDER_PATH=$CONTENTS_FOLDER_PATH\n"; }; - ABAB7B6EBA5C48167F3A008C /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CCC-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - 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; - }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -616,7 +569,6 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = CB3F2CB9B5D0920F890DA73A /* Pods-CCC.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -652,7 +604,6 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FF1FD2425A9A57DA8C484F81 /* Pods-CCC.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; diff --git a/ios/CCC.xcworkspace/contents.xcworkspacedata b/ios/CCC.xcworkspace/contents.xcworkspacedata index b65973676e..299b090cb3 100644 --- a/ios/CCC.xcworkspace/contents.xcworkspacedata +++ b/ios/CCC.xcworkspace/contents.xcworkspacedata @@ -4,9 +4,6 @@ - - diff --git a/ios/Podfile.lock b/ios/Podfile.lock deleted file mode 100644 index 938d819c05..0000000000 --- a/ios/Podfile.lock +++ /dev/null @@ -1,3 +0,0 @@ -PODFILE CHECKSUM: 86a9ccd4a520dbd3e79496b0551b16856454211d - -COCOAPODS: 1.11.2 diff --git a/ios/podfile b/ios/podfile deleted file mode 100644 index 805a8d2897..0000000000 --- a/ios/podfile +++ /dev/null @@ -1,10 +0,0 @@ -# Uncomment the next line to define a global platform for your project -platform :ios, '14.0' - -target 'CCC' do - # Comment the next line if you don't want to use dynamic frameworks - use_frameworks! - - # Pods for CCC - -end From 7c9b024e804255dde3b9efbcae1c935b5e235998 Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Fri, 5 Aug 2022 13:28:49 +0200 Subject: [PATCH 4/5] [#885] add workspace and project files into git (#886) --- .github/workflows/main.yml | 4 +- .github/workflows/release.yml | 2 +- .github/workflows/testing.yml | 2 +- ios/.gitignore | 5 +- .../xcshareddata/swiftpm/Package.resolved | 23 +++ .../xcshareddata/swiftpm/Package.resolved | 149 ++++++++++++++++++ 6 files changed, 177 insertions(+), 8 deletions(-) create mode 100644 ios/CCC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cb914edeea..0eef0ad536 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ env: jobs: GradleBuild: - runs-on: macos-latest + runs-on: macos-12 outputs: status: ${{ steps.status.outputs.status }} steps: @@ -86,7 +86,7 @@ jobs: run: echo "::set-output name=status::success" XCodeBuild: - runs-on: macos-latest + runs-on: macos-12 outputs: status: ${{ steps.status.outputs.status }} steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e9a7dbfc2e..12c9f32cc7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -185,7 +185,7 @@ jobs: run: echo "::set-output name=status::success" PublishAppStore: - runs-on: macos-latest + runs-on: macos-12 outputs: status: ${{ steps.status.outputs.status }} steps: diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index d58e820a13..69e29a7f4c 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -83,7 +83,7 @@ jobs: DistributeIOS: - runs-on: macos-latest + runs-on: macos-12 outputs: status: ${{ steps.status.outputs.status }} steps: diff --git a/ios/.gitignore b/ios/.gitignore index 4233f8f44f..d9b5082c43 100644 --- a/ios/.gitignore +++ b/ios/.gitignore @@ -4,7 +4,4 @@ CCC/Resources/Release.xcconfig fastlane/.env fastlane/README.md fastlane/report.xml -xcuserdata - -# TODO it is a workaround remove when Xcode & SPM bug fixed -/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved \ No newline at end of file +xcuserdata \ No newline at end of file diff --git a/ios/CCC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/CCC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000000..d46091defa --- /dev/null +++ b/ios/CCC.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,23 @@ +{ + "pins" : [ + { + "identity" : "swiftmessages", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SwiftKickMobile/SwiftMessages", + "state" : { + "revision" : "b29dd21090b708aa0ae9ecbaf6e2d0487028dc3f", + "version" : "9.0.6" + } + }, + { + "identity" : "swiftui-navigation-stack", + "kind" : "remoteSourceControl", + "location" : "https://github.com/matteopuc/swiftui-navigation-stack", + "state" : { + "revision" : "be0db68ed0d84ed543bf8f7600a1f84de015f753", + "version" : "1.0.4" + } + } + ], + "version" : 2 +} diff --git a/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000000..0d4959fecd --- /dev/null +++ b/ios/CCC.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,149 @@ +{ + "pins" : [ + { + "identity" : "abseil-cpp-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/abseil-cpp-SwiftPM.git", + "state" : { + "revision" : "583de9bd60f66b40e78d08599cc92036c2e7e4e1", + "version" : "0.20220203.2" + } + }, + { + "identity" : "boringssl-swiftpm", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/boringssl-SwiftPM.git", + "state" : { + "revision" : "dd3eda2b05a3f459fc3073695ad1b28659066eab", + "version" : "0.9.1" + } + }, + { + "identity" : "firebase-ios-sdk", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/firebase-ios-sdk", + "state" : { + "revision" : "8467858fc4cee858511380ac0f9ea5a17d007b5d", + "version" : "9.3.0" + } + }, + { + "identity" : "googleappmeasurement", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleAppMeasurement.git", + "state" : { + "revision" : "f54f60d0164d887e1174fa51ab2efe48a8e9d178", + "version" : "9.3.0" + } + }, + { + "identity" : "googledatatransport", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleDataTransport.git", + "state" : { + "revision" : "5056b15c5acbb90cd214fe4d6138bdf5a740e5a8", + "version" : "9.2.0" + } + }, + { + "identity" : "googleutilities", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/GoogleUtilities.git", + "state" : { + "revision" : "f4abe56ce62a779e64b525eb133c8fc2a84bbc1f", + "version" : "7.7.1" + } + }, + { + "identity" : "grpc-ios", + "kind" : "remoteSourceControl", + "location" : "https://github.com/grpc/grpc-ios.git", + "state" : { + "revision" : "8440b914756e0d26d4f4d054a1c1581daedfc5b6", + "version" : "1.44.3-grpc" + } + }, + { + "identity" : "gtm-session-fetcher", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/gtm-session-fetcher.git", + "state" : { + "revision" : "19605024d59eaefdb1f6a2cb11ebe75df4421126", + "version" : "2.0.0" + } + }, + { + "identity" : "leveldb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/leveldb.git", + "state" : { + "revision" : "0706abcc6b0bd9cedfbb015ba840e4a780b5159b", + "version" : "1.22.2" + } + }, + { + "identity" : "nanopb", + "kind" : "remoteSourceControl", + "location" : "https://github.com/firebase/nanopb.git", + "state" : { + "revision" : "819d0a2173aff699fb8c364b6fb906f7cdb1a692", + "version" : "2.30909.0" + } + }, + { + "identity" : "promises", + "kind" : "remoteSourceControl", + "location" : "https://github.com/google/promises.git", + "state" : { + "revision" : "3e4e743631e86c8c70dbc6efdc7beaa6e90fd3bb", + "version" : "2.1.1" + } + }, + { + "identity" : "swift-package-manager-google-mobile-ads", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googleads/swift-package-manager-google-mobile-ads.git", + "state" : { + "revision" : "43e3cee3bdffe35a1b536fdda01988a3e04bdcec", + "version" : "9.8.0" + } + }, + { + "identity" : "swift-package-manager-google-user-messaging-platform", + "kind" : "remoteSourceControl", + "location" : "https://github.com/googleads/swift-package-manager-google-user-messaging-platform.git", + "state" : { + "revision" : "3b924ce3313a5fd2fc6a8dc889a8c38f76890fe3", + "version" : "2.0.0" + } + }, + { + "identity" : "swift-protobuf", + "kind" : "remoteSourceControl", + "location" : "https://github.com/apple/swift-protobuf.git", + "state" : { + "revision" : "fa0fcd43f272a260e7f734f23e6dc55e16fcae0a", + "version" : "1.19.1" + } + }, + { + "identity" : "swiftmessages", + "kind" : "remoteSourceControl", + "location" : "https://github.com/SwiftKickMobile/SwiftMessages", + "state" : { + "revision" : "b29dd21090b708aa0ae9ecbaf6e2d0487028dc3f", + "version" : "9.0.6" + } + }, + { + "identity" : "swiftui-navigation-stack", + "kind" : "remoteSourceControl", + "location" : "https://github.com/matteopuc/swiftui-navigation-stack", + "state" : { + "revision" : "be0db68ed0d84ed543bf8f7600a1f84de015f753", + "version" : "1.0.4" + } + } + ], + "version" : 2 +} From fffb02bab3af1e1f772f6f05d328ff63284465ad Mon Sep 17 00:00:00 2001 From: Mustafa Ozhan Date: Fri, 5 Aug 2022 19:31:05 +0200 Subject: [PATCH 5/5] [#889] iOS crash reporting problem (#890) --- ios/CCC.xcodeproj/project.pbxproj | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/ios/CCC.xcodeproj/project.pbxproj b/ios/CCC.xcodeproj/project.pbxproj index af60f478b9..afd0e5d0d2 100644 --- a/ios/CCC.xcodeproj/project.pbxproj +++ b/ios/CCC.xcodeproj/project.pbxproj @@ -312,6 +312,7 @@ 7555FF78242A565900829871 /* Frameworks */, 7555FF79242A565900829871 /* Resources */, 7555FFB4242A642300829871 /* Embed Frameworks */, + 5C3BC744289D7B2C009F1073 /* Firebase Crashlytics */, ); buildRules = ( ); @@ -383,6 +384,26 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 5C3BC744289D7B2C009F1073 /* Firebase Crashlytics */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", + "$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)", + ); + name = "Firebase Crashlytics"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n\nif [ \"${CONFIGURATION}\" = \"Release\" ]; then\n \"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\nfi\n"; + }; 7555FFB5242A651A00829871 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 12;