fix: fix build test

layoutBox · Nov 18, 2024 · 0c8587e · 0c8587e
1 parent df3a6a6
commit 0c8587e
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 88 deletions.
diff --git a/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
diff --git a/Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj b/Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj
@@ -199,7 +199,7 @@
 		249EFE361E64FAFE00165E39 = {
 			isa = PBXGroup;
 			children = (
-				249EFE411E64FAFE00165E39 /* ../FlexLayoutSample */,
+				249EFE411E64FAFE00165E39 /* FlexLayoutSample */,
 				461884C59B72ACEAFC912B8A /* Frameworks */,
 				85CAAE97812075333AF3E88F /* Pods */,
 				249EFE401E64FAFE00165E39 /* Products */,
@@ -214,7 +214,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		249EFE411E64FAFE00165E39 /* ../FlexLayoutSample */ = {
+		249EFE411E64FAFE00165E39 /* FlexLayoutSample */ = {
 			isa = PBXGroup;
 			children = (
 				2439CC671E66614D003326FB /* Supporting Files */,

diff --git a/Example/cocoapods/Podfile b/Example/cocoapods/Podfile
diff --git a/Example/cocoapods/Podfile.lock b/Example/cocoapods/Podfile.lock
diff --git a/Podfile.lock b/Podfile.lock
@@ -29,11 +29,11 @@ CHECKOUT OPTIONS:
     :tag: v3.1.0
 
 SPEC CHECKSUMS:
-  FlexLayout: a480ae4cb2b8a595c646cf7a3d2c7747951700a1
+  FlexLayout: aaf305c1f3203be3d8694c3835773d1e7a912b72
   PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
   SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
   Yoga: 73e3c7ca57e233ad32a1a265a8b55dcce6c4d529
 
 PODFILE CHECKSUM: 616cb577f11ab8498737680dedeed47c6fae4b64
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -6,7 +6,7 @@
 
 # This is the minimum version number required.
 # Update this, if you use features of a newer version
-fastlane_version "2.29.0"
+fastlane_version '2.29.0'
 
 default_platform :ios
 skip_docs
@@ -22,95 +22,77 @@ platform :ios do
       use_bundle_exec: true,
       try_repo_update_on_error: true
     )
-
-    cocoapods(
-      podfile: "Example/cocoapods",
-      use_bundle_exec: true,
-      try_repo_update_on_error: true
-    )
   end
 
-
   lane :build do
     swiftlint(
-      mode: :lint, 
-      config_file: ".swiftlint.yml",
-      executable: "Pods/SwiftLint/swiftlint",
+      mode: :lint,
+      config_file: '.swiftlint.yml',
+      executable: 'Pods/SwiftLint/swiftlint',
       ignore_exit_status: true
     )
 
     # FlexLayout
     xcodebuild(
-      project: "FlexLayout.xcodeproj",
-      scheme: "FlexLayoutInner",
-      configuration: "Release",
+      workspace: 'FlexLayout.xcworkspace',
+      scheme: 'FlexLayoutInner',
+      configuration: 'Release',
       build: true,
       clean: true,
-      destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
+      destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
     )
 
     # FlexLayoutSample from FlexLayout.xcworkspace
     xcodebuild(
-      workspace: "FlexLayout.xcworkspace",
-      scheme: "FlexLayoutSample",
-      configuration: "Release",
+      workspace: 'FlexLayout.xcworkspace',
+      scheme: 'FlexLayoutSample',
+      configuration: 'Release',
       build: true,
       # clean: true,
-      destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
-    )
-
-    # Example Cocoapods
-    xcodebuild(
-      workspace: "Example/cocoapods/FlexLayoutSample.xcworkspace",
-      scheme: "FlexLayoutSample",
-      configuration: "Release",
-      build: true,
-      # clean: true,
-      destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
+      destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
     )
 
     # Example SPM (Swift Package Manager)
     xcodebuild(
-      project: "Example/SPM/FlexLayoutSample-SPM.xcodeproj",
-      scheme: "FlexLayoutSample-SPM",
-      configuration: "Release",
+      project: 'Example/SPM/FlexLayoutSample-SPM.xcodeproj',
+      scheme: 'FlexLayoutSample-SPM',
+      configuration: 'Release',
       build: true,
       clean: true,
-      destination: "platform=iOS Simulator,name=iPhone 15,OS=17.2"
+      destination: 'platform=iOS Simulator,name=iPhone 15,OS=17.2'
     )
   end
 
   lane :tests do
-    scan(scheme: "FlexLayoutInner", workspace: "FlexLayout.xcworkspace", device: "iPhone 15")
+    scan(scheme: 'FlexLayoutInner', workspace: 'FlexLayout.xcworkspace', device: 'iPhone 15')
   end
 
-  lane :doc do 
+  lane :doc do
     jazzy
   end
 
   lane :travis do
     install
     tests
     build
-    #pod_lib_lint(allow_warnings: true, verbose: false)
+    # pod_lib_lint(allow_warnings: true, verbose: false)
   end
 
   lane :deploy do
     ensure_git_branch
-    version = version_bump_podspec(path: "FlexLayout.podspec")
-    git_commit(path: ["./FlexLayout.podspec"], message: "Bumped to version #{version}")
+    version = version_bump_podspec(path: 'FlexLayout.podspec')
+    git_commit(path: ['./FlexLayout.podspec'], message: "Bumped to version #{version}")
     push_to_git_remote(remote_branch: 'master', force: false, tags: true)
     changelog = changelog_from_git_commits
     github_release = set_github_release(
-      repository_name: "layoutBox/FlexLayout",
+      repository_name: 'layoutBox/FlexLayout',
       api_token: ENV['GITHUB_TOKEN'],
       name: version,
       tag_name: version,
       description: changelog,
-      commitish: "master"
+      commitish: 'master'
     )
-    sh("git fetch --tags")
+    sh('git fetch --tags')
     pod_push(allow_warnings: true, verbose: true)
   end
-
 end