Elimate cocoapods usage in samples (#1470)

cashapp · Sep 11, 2023 · 1eec9f9 · 1eec9f9
1 parent e9a5c4d
commit 1eec9f9
Show file tree

Hide file tree

Showing 14 changed files with 51 additions and 275 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -115,9 +115,7 @@ jobs:
 
       - name: Build Counter iOS (UIKit)
         run: |
-          cd samples/counter/ios-uikit
-          pod install
-          xcodebuild -workspace CounterApp.xcworkspace -scheme CounterApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'
+          xcodebuild -project samples/counter/ios-uikit/CounterApp.xcodeproj -scheme CounterApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'
 
   sample-emoji:
     runs-on: macos-latest
@@ -137,9 +135,7 @@ jobs:
 
       - name: Build Emoji Search iOS (UIKit)
         run: |
-          cd samples/emoji-search/ios-uikit
-          pod install
-          xcodebuild -workspace EmojiSearchApp.xcworkspace -scheme EmojiSearchApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'
+          xcodebuild -project samples/emoji-search/ios-uikit/EmojiSearchApp.xcodeproj -scheme EmojiSearchApp -destination 'platform=iOS Simulator,name=iPhone 12,OS=latest'
 
   test-app:
     runs-on: macos-latest

diff --git a/.gitignore b/.gitignore
@@ -15,9 +15,6 @@ local.properties
 *.xcworkspace
 xcuserdata
 
-# Cocoapods
-Pods
-
 # Paparazzi
 redwood-layout-composeui/out/failures
 redwood-layout-view/out/failures
diff --git a/samples/counter/README.md b/samples/counter/README.md
@@ -33,9 +33,7 @@ Running Counter on iOS
 
 Run this:
 ```
-cd samples/counter/ios-uikit
-pod install
-open CounterApp.xcworkspace
+open samples/counter/ios-uikit/CounterApp.xcodeproj
 ```
 
 Then build and run the app. The shared Kotlin code will be built automatically as part of building the iOS app, and also rebuilt as needed.

diff --git a/samples/counter/ios-shared/CounterKt.podspec b/samples/counter/ios-shared/CounterKt.podspec
diff --git a/samples/counter/ios-shared/build.gradle b/samples/counter/ios-shared/build.gradle
@@ -15,17 +15,15 @@
  */
 
 apply plugin: 'org.jetbrains.kotlin.multiplatform'
-apply plugin: 'org.jetbrains.kotlin.native.cocoapods'
 apply plugin: 'app.cash.redwood'
 
 kotlin {
-  iosArm64()
-  iosX64()
-  iosSimulatorArm64()
-
-  cocoapods {
-    noPodspec()
-    framework {
+  [
+    iosArm64(),
+    iosX64(),
+    iosSimulatorArm64(),
+  ].each { iosTarget ->
+    iosTarget.binaries.framework {
       baseName = 'CounterKt'
     }
   }

diff --git a/samples/counter/ios-uikit/CounterApp.xcodeproj/project.pbxproj b/samples/counter/ios-uikit/CounterApp.xcodeproj/project.pbxproj
@@ -12,12 +12,10 @@
 		635661DC21F12B8000DD7240 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 635661DB21F12B8000DD7240 /* Assets.xcassets */; };
 		635661DF21F12B8000DD7240 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 635661DD21F12B8000DD7240 /* LaunchScreen.storyboard */; };
 		CB85C0B725AFE61A007A2CC7 /* CounterViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB85C0B625AFE61A007A2CC7 /* CounterViewController.swift */; };
-		CB85EE5426648F6900A4B218 /* Pods_CounterApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00A9C28A8FE3CCC0B75F8DBE /* Pods_CounterApp.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		00A9C28A8FE3CCC0B75F8DBE /* Pods_CounterApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_CounterApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		4B9986777126F871E922EFF8 /* Pods-CounterApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CounterApp.release.xcconfig"; path = "Target Support Files/Pods-CounterApp/Pods-CounterApp.release.xcconfig"; sourceTree = "<group>"; };
+		00D5E68D2AAF3EBD00692213 /* ios-shared */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "ios-shared"; path = "../ios-shared"; sourceTree = "<group>"; };
 		635661D121F12B7E00DD7240 /* CounterApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = CounterApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		635661D421F12B7E00DD7240 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		635661D921F12B7E00DD7240 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -26,29 +24,34 @@
 		635661E021F12B8000DD7240 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		63E90CF521FEBBB700449E04 /* main.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = main.framework; path = "../shared/build/xcode-frameworks/main.framework"; sourceTree = "<group>"; };
 		CB85C0B625AFE61A007A2CC7 /* CounterViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CounterViewController.swift; sourceTree = "<group>"; };
-		FE5DC566933F8A25E4B4D71D /* Pods-CounterApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CounterApp.debug.xcconfig"; path = "Target Support Files/Pods-CounterApp/Pods-CounterApp.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		635661CE21F12B7E00DD7240 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				CB85EE5426648F6900A4B218 /* Pods_CounterApp.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		00D5E68C2AAF3EBD00692213 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				00D5E68D2AAF3EBD00692213 /* ios-shared */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		635661C821F12B7D00DD7240 = {
 			isa = PBXGroup;
 			children = (
 				63E90CF521FEBBB700449E04 /* main.framework */,
 				635661D321F12B7E00DD7240 /* CounterApp */,
 				635661D221F12B7E00DD7240 /* Products */,
-				B5604532F7F0C4349EF67F9C /* Pods */,
-				C6AEA68F26E2A3BD052DEDBB /* Frameworks */,
+				00D5E68C2AAF3EBD00692213 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -73,35 +76,17 @@
 			path = CounterApp;
 			sourceTree = "<group>";
 		};
-		B5604532F7F0C4349EF67F9C /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				FE5DC566933F8A25E4B4D71D /* Pods-CounterApp.debug.xcconfig */,
-				4B9986777126F871E922EFF8 /* Pods-CounterApp.release.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
-		C6AEA68F26E2A3BD052DEDBB /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				00A9C28A8FE3CCC0B75F8DBE /* Pods_CounterApp.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
 		635661D021F12B7E00DD7240 /* CounterApp */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 635661E321F12B8000DD7240 /* Build configuration list for PBXNativeTarget "CounterApp" */;
 			buildPhases = (
-				C0A74553EE688F26124F6281 /* [CP] Check Pods Manifest.lock */,
+				00663F3E2AAF2F52006EA671 /* ShellScript */,
 				635661CD21F12B7E00DD7240 /* Sources */,
 				635661CE21F12B7E00DD7240 /* Frameworks */,
 				635661CF21F12B7E00DD7240 /* Resources */,
-				5F3CFDEBC3AA573649C00FA4 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -160,44 +145,22 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		5F3CFDEBC3AA573649C00FA4 /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CounterApp/Pods-CounterApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-CounterApp/Pods-CounterApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CounterApp/Pods-CounterApp-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		C0A74553EE688F26124F6281 /* [CP] Check Pods Manifest.lock */ = {
+		00663F3E2AAF2F52006EA671 /* ShellScript */ = {
 			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-CounterApp-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;
+			shellScript = "cd \"$SRCROOT/../../..\"\n./gradlew :samples:counter:ios-shared:embedAndSignAppleFrameworkForXcode\n\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -353,18 +316,23 @@
 		};
 		635661E421F12B8000DD7240 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = FE5DC566933F8A25E4B4D71D /* Pods-CounterApp.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 2UER9BPG44;
 				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../ios-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = CounterApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					CounterKt,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.treehouse.sample.counter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -375,18 +343,23 @@
 		};
 		635661E521F12B8000DD7240 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 4B9986777126F871E922EFF8 /* Pods-CounterApp.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = 2UER9BPG44;
 				ENABLE_BITCODE = NO;
+				FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../ios-shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
 				INFOPLIST_FILE = CounterApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
+				OTHER_LDFLAGS = (
+					"$(inherited)",
+					"-framework",
+					CounterKt,
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.example.treehouse.sample.counter;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

diff --git a/samples/counter/ios-uikit/Podfile b/samples/counter/ios-uikit/Podfile
diff --git a/samples/counter/ios-uikit/Podfile.lock b/samples/counter/ios-uikit/Podfile.lock
diff --git a/samples/emoji-search/README.md b/samples/emoji-search/README.md
@@ -56,9 +56,7 @@ Running Emoji-Search on iOS
 
 Run this:
 ```
-cd samples/emoji-search/ios-uikit
-pod install
-open EmojiSearchApp.xcworkspace
+open samples/emoji-search/ios-uikit/EmojiSearchApp.xcodeproj
 ```
 
 Then build and run the app. The shared Kotlin code will be built automatically as part of building the iOS app, and also rebuilt as needed.

diff --git a/samples/emoji-search/ios-shared/EmojiSearchKt.podspec b/samples/emoji-search/ios-shared/EmojiSearchKt.podspec