From 6d583691cd9c971e6de05632f72a88495130efda Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Sun, 6 Aug 2023 15:38:38 +0900 Subject: [PATCH 1/8] add ci_scripts --- .../DroidKaigi2023.xcodeproj/project.pbxproj | 12 ++++++++++++ .../DroidKaigi2023/ci_scripts/ci_post_clone.sh | 3 +++ .../DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh | 6 ++++++ 3 files changed, 21 insertions(+) create mode 100644 app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh create mode 100644 app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj index bb3f14090..fe811d826 100644 --- a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj @@ -44,6 +44,8 @@ D77DAF8829FAA14A007195DB /* DroidKaigi2023UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DroidKaigi2023UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITests.swift; sourceTree = ""; }; D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITestsLaunchTests.swift; sourceTree = ""; }; + E8BCCCDF2A7F7676004010F7 /* ci_post_clone.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = ""; }; + E8BCCCE02A7F76AA004010F7 /* ci_pre_xcodebuild.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_pre_xcodebuild.sh; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -103,6 +105,7 @@ D77DAF6F29FAA148007195DB /* DroidKaigi2023 */ = { isa = PBXGroup; children = ( + E8BCCCDE2A7F7667004010F7 /* ci_scripts */, D77DAF7029FAA148007195DB /* App.swift */, D77DAF7429FAA149007195DB /* Assets.xcassets */, D77DAF7629FAA149007195DB /* DroidKaigi2023.entitlements */, @@ -136,6 +139,15 @@ path = DroidKaigi2023UITests; sourceTree = ""; }; + E8BCCCDE2A7F7667004010F7 /* ci_scripts */ = { + isa = PBXGroup; + children = ( + E8BCCCDF2A7F7676004010F7 /* ci_post_clone.sh */, + E8BCCCE02A7F76AA004010F7 /* ci_pre_xcodebuild.sh */, + ); + path = ci_scripts; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh new file mode 100644 index 000000000..8e4a1e1a0 --- /dev/null +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh @@ -0,0 +1,3 @@ +#!/bin/zsh + +brew install openjdk@17 diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh new file mode 100644 index 000000000..e64f51536 --- /dev/null +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh @@ -0,0 +1,6 @@ +#!/bin/zsh + +export PATH="/usr/local/opt/openjdk@17/bin:$PATH" + +cd "$CI_WORKSPACE/app-ios" +./gradlew :app-ios-shared:assembleSharedReleaseXCFramework From 5a00a2848d13190c34d2b4bcc09ad0c2b446f5f7 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 7 Aug 2023 02:14:09 +0900 Subject: [PATCH 2/8] update executable --- .../App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh | 0 .../DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh mode change 100644 => 100755 app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh old mode 100644 new mode 100755 diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh b/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh old mode 100644 new mode 100755 From c2712340b544a4b595204f3068b0de942553e7dd Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 7 Aug 2023 02:18:34 +0900 Subject: [PATCH 3/8] mv dir --- .../DroidKaigi2023.xcodeproj/project.pbxproj | 16 ++++------------ .../ci_scripts/ci_post_clone.sh | 0 .../ci_scripts/ci_pre_xcodebuild.sh | 0 3 files changed, 4 insertions(+), 12 deletions(-) rename app-ios/App/DroidKaigi2023/{DroidKaigi2023 => }/ci_scripts/ci_post_clone.sh (100%) rename app-ios/App/DroidKaigi2023/{DroidKaigi2023 => }/ci_scripts/ci_pre_xcodebuild.sh (100%) diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj index fe811d826..6ef59d16d 100644 --- a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj @@ -14,6 +14,7 @@ D77DAF8D29FAA14A007195DB /* DroidKaigi2023UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */; }; D77DAF8F29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */; }; E847EB8B2A379C620051EF1A /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = E847EB8A2A379C620051EF1A /* Navigation */; }; + E8BCCCE22A800D55004010F7 /* ci_scripts in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCE12A800D55004010F7 /* ci_scripts */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -44,8 +45,7 @@ D77DAF8829FAA14A007195DB /* DroidKaigi2023UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DroidKaigi2023UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITests.swift; sourceTree = ""; }; D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITestsLaunchTests.swift; sourceTree = ""; }; - E8BCCCDF2A7F7676004010F7 /* ci_post_clone.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = ""; }; - E8BCCCE02A7F76AA004010F7 /* ci_pre_xcodebuild.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = ci_pre_xcodebuild.sh; sourceTree = ""; }; + E8BCCCE12A800D55004010F7 /* ci_scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ci_scripts; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -84,6 +84,7 @@ D77DAF6429FAA148007195DB = { isa = PBXGroup; children = ( + E8BCCCE12A800D55004010F7 /* ci_scripts */, D77DAF6F29FAA148007195DB /* DroidKaigi2023 */, D77DAF8129FAA14A007195DB /* DroidKaigi2023Tests */, D77DAF8B29FAA14A007195DB /* DroidKaigi2023UITests */, @@ -105,7 +106,6 @@ D77DAF6F29FAA148007195DB /* DroidKaigi2023 */ = { isa = PBXGroup; children = ( - E8BCCCDE2A7F7667004010F7 /* ci_scripts */, D77DAF7029FAA148007195DB /* App.swift */, D77DAF7429FAA149007195DB /* Assets.xcassets */, D77DAF7629FAA149007195DB /* DroidKaigi2023.entitlements */, @@ -139,15 +139,6 @@ path = DroidKaigi2023UITests; sourceTree = ""; }; - E8BCCCDE2A7F7667004010F7 /* ci_scripts */ = { - isa = PBXGroup; - children = ( - E8BCCCDF2A7F7676004010F7 /* ci_post_clone.sh */, - E8BCCCE02A7F76AA004010F7 /* ci_pre_xcodebuild.sh */, - ); - path = ci_scripts; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -255,6 +246,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + E8BCCCE22A800D55004010F7 /* ci_scripts in Resources */, D77DAF7929FAA149007195DB /* Preview Assets.xcassets in Resources */, D77DAF7529FAA149007195DB /* Assets.xcassets in Resources */, ); diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh similarity index 100% rename from app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_post_clone.sh rename to app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh similarity index 100% rename from app-ios/App/DroidKaigi2023/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh rename to app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh From 92b5332378e166d570e4b021bcb81a2f13398b7a Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 7 Aug 2023 02:40:07 +0900 Subject: [PATCH 4/8] delete xcworkspace, recreate scripts --- .../DroidKaigi2023.xcodeproj/project.pbxproj | 34 ++++++++++++++----- .../contents.xcworkspacedata | 7 ++++ .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../contents.xcworkspacedata | 10 ------ .../xcshareddata/WorkspaceSettings.xcsettings | 8 ----- 6 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename app-ios/{app-ios.xcworkspace => App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace}/xcshareddata/IDEWorkspaceChecks.plist (100%) rename app-ios/{app-ios.xcworkspace => App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace}/xcshareddata/swiftpm/Package.resolved (100%) delete mode 100644 app-ios/app-ios.xcworkspace/contents.xcworkspacedata delete mode 100644 app-ios/app-ios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj index 6ef59d16d..049557f24 100644 --- a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj @@ -13,8 +13,10 @@ D77DAF8329FAA14A007195DB /* DroidKaigi2023Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8229FAA14A007195DB /* DroidKaigi2023Tests.swift */; }; D77DAF8D29FAA14A007195DB /* DroidKaigi2023UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */; }; D77DAF8F29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */; }; - E847EB8B2A379C620051EF1A /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = E847EB8A2A379C620051EF1A /* Navigation */; }; - E8BCCCE22A800D55004010F7 /* ci_scripts in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCE12A800D55004010F7 /* ci_scripts */; }; + E8BCCCE72A8011E8004010F7 /* Modules in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCE62A8011E8004010F7 /* Modules */; }; + E8BCCCEC2A80123E004010F7 /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = E8BCCCEB2A80123E004010F7 /* Navigation */; }; + E8BCCCF02A80126D004010F7 /* ci_pre_xcodebuild.sh in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCEE2A80126D004010F7 /* ci_pre_xcodebuild.sh */; }; + E8BCCCF12A80126D004010F7 /* ci_post_clone.sh in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -45,7 +47,9 @@ D77DAF8829FAA14A007195DB /* DroidKaigi2023UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DroidKaigi2023UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITests.swift; sourceTree = ""; }; D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITestsLaunchTests.swift; sourceTree = ""; }; - E8BCCCE12A800D55004010F7 /* ci_scripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = ci_scripts; sourceTree = ""; }; + E8BCCCE62A8011E8004010F7 /* Modules */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Modules; path = ../../Modules; sourceTree = ""; }; + E8BCCCEE2A80126D004010F7 /* ci_pre_xcodebuild.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ci_pre_xcodebuild.sh; sourceTree = ""; }; + E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -53,7 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - E847EB8B2A379C620051EF1A /* Navigation in Frameworks */, + E8BCCCEC2A80123E004010F7 /* Navigation in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -84,7 +88,8 @@ D77DAF6429FAA148007195DB = { isa = PBXGroup; children = ( - E8BCCCE12A800D55004010F7 /* ci_scripts */, + E8BCCCED2A801257004010F7 /* ci_scripts */, + E8BCCCE62A8011E8004010F7 /* Modules */, D77DAF6F29FAA148007195DB /* DroidKaigi2023 */, D77DAF8129FAA14A007195DB /* DroidKaigi2023Tests */, D77DAF8B29FAA14A007195DB /* DroidKaigi2023UITests */, @@ -139,6 +144,15 @@ path = DroidKaigi2023UITests; sourceTree = ""; }; + E8BCCCED2A801257004010F7 /* ci_scripts */ = { + isa = PBXGroup; + children = ( + E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */, + E8BCCCEE2A80126D004010F7 /* ci_pre_xcodebuild.sh */, + ); + path = ci_scripts; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -156,7 +170,7 @@ ); name = DroidKaigi2023; packageProductDependencies = ( - E847EB8A2A379C620051EF1A /* Navigation */, + E8BCCCEB2A80123E004010F7 /* Navigation */, ); productName = DroidKaigi2023; productReference = D77DAF6D29FAA148007195DB /* DroidKaigi2023.app */; @@ -230,6 +244,8 @@ Base, ); mainGroup = D77DAF6429FAA148007195DB; + packageReferences = ( + ); productRefGroup = D77DAF6E29FAA148007195DB /* Products */; projectDirPath = ""; projectRoot = ""; @@ -246,9 +262,11 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - E8BCCCE22A800D55004010F7 /* ci_scripts in Resources */, + E8BCCCE72A8011E8004010F7 /* Modules in Resources */, D77DAF7929FAA149007195DB /* Preview Assets.xcassets in Resources */, D77DAF7529FAA149007195DB /* Assets.xcassets in Resources */, + E8BCCCF12A80126D004010F7 /* ci_post_clone.sh in Resources */, + E8BCCCF02A80126D004010F7 /* ci_pre_xcodebuild.sh in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -631,7 +649,7 @@ /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - E847EB8A2A379C620051EF1A /* Navigation */ = { + E8BCCCEB2A80123E004010F7 /* Navigation */ = { isa = XCSwiftPackageProductDependency; productName = Navigation; }; diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 000000000..919434a62 --- /dev/null +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/app-ios/app-ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from app-ios/app-ios.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/app-ios/app-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from app-ios/app-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/app-ios/app-ios.xcworkspace/contents.xcworkspacedata b/app-ios/app-ios.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index b3ea1bf55..000000000 --- a/app-ios/app-ios.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/app-ios/app-ios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/app-ios/app-ios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings deleted file mode 100644 index f9b0d7c5e..000000000 --- a/app-ios/app-ios.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - PreviewsEnabled - - - From d5580082ed8e00e1e8462415034c61d3f644c557 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 7 Aug 2023 03:05:29 +0900 Subject: [PATCH 5/8] gen xcframework with post_clone --- .../DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj | 4 ---- app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh | 5 +++++ app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh | 6 ------ 3 files changed, 5 insertions(+), 10 deletions(-) delete mode 100755 app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh diff --git a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj index 049557f24..11691a128 100644 --- a/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj +++ b/app-ios/App/DroidKaigi2023/DroidKaigi2023.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ D77DAF8F29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */; }; E8BCCCE72A8011E8004010F7 /* Modules in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCE62A8011E8004010F7 /* Modules */; }; E8BCCCEC2A80123E004010F7 /* Navigation in Frameworks */ = {isa = PBXBuildFile; productRef = E8BCCCEB2A80123E004010F7 /* Navigation */; }; - E8BCCCF02A80126D004010F7 /* ci_pre_xcodebuild.sh in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCEE2A80126D004010F7 /* ci_pre_xcodebuild.sh */; }; E8BCCCF12A80126D004010F7 /* ci_post_clone.sh in Resources */ = {isa = PBXBuildFile; fileRef = E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */; }; /* End PBXBuildFile section */ @@ -48,7 +47,6 @@ D77DAF8C29FAA14A007195DB /* DroidKaigi2023UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITests.swift; sourceTree = ""; }; D77DAF8E29FAA14A007195DB /* DroidKaigi2023UITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DroidKaigi2023UITestsLaunchTests.swift; sourceTree = ""; }; E8BCCCE62A8011E8004010F7 /* Modules */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = Modules; path = ../../Modules; sourceTree = ""; }; - E8BCCCEE2A80126D004010F7 /* ci_pre_xcodebuild.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ci_pre_xcodebuild.sh; sourceTree = ""; }; E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = ci_post_clone.sh; sourceTree = ""; }; /* End PBXFileReference section */ @@ -148,7 +146,6 @@ isa = PBXGroup; children = ( E8BCCCEF2A80126D004010F7 /* ci_post_clone.sh */, - E8BCCCEE2A80126D004010F7 /* ci_pre_xcodebuild.sh */, ); path = ci_scripts; sourceTree = ""; @@ -266,7 +263,6 @@ D77DAF7929FAA149007195DB /* Preview Assets.xcassets in Resources */, D77DAF7529FAA149007195DB /* Assets.xcassets in Resources */, E8BCCCF12A80126D004010F7 /* ci_post_clone.sh in Resources */, - E8BCCCF02A80126D004010F7 /* ci_pre_xcodebuild.sh in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh index 8e4a1e1a0..ac74e9ca5 100755 --- a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh +++ b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh @@ -1,3 +1,8 @@ #!/bin/zsh brew install openjdk@17 + +export PATH="/usr/local/opt/openjdk@17/bin:$PATH" + +cd "$CI_WORKSPACE/app-ios" +./gradlew :app-ios-shared:assembleSharedReleaseXCFramework diff --git a/app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh deleted file mode 100755 index e64f51536..000000000 --- a/app-ios/App/DroidKaigi2023/ci_scripts/ci_pre_xcodebuild.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/zsh - -export PATH="/usr/local/opt/openjdk@17/bin:$PATH" - -cd "$CI_WORKSPACE/app-ios" -./gradlew :app-ios-shared:assembleSharedReleaseXCFramework From 276e71f85342e50ef39b4f30dbdf91c444f20216 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 7 Aug 2023 03:20:06 +0900 Subject: [PATCH 6/8] use parent dir --- app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh index ac74e9ca5..813858291 100755 --- a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh +++ b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh @@ -5,4 +5,4 @@ brew install openjdk@17 export PATH="/usr/local/opt/openjdk@17/bin:$PATH" cd "$CI_WORKSPACE/app-ios" -./gradlew :app-ios-shared:assembleSharedReleaseXCFramework +../gradlew :app-ios-shared:assembleSharedReleaseXCFramework From 7c9a3267f71835e7b0857c655c0f8d7882620fd2 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Mon, 7 Aug 2023 03:28:20 +0900 Subject: [PATCH 7/8] ch dir --- app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh index 813858291..0e722796e 100755 --- a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh +++ b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh @@ -4,5 +4,5 @@ brew install openjdk@17 export PATH="/usr/local/opt/openjdk@17/bin:$PATH" -cd "$CI_WORKSPACE/app-ios" -../gradlew :app-ios-shared:assembleSharedReleaseXCFramework +cd "$CI_WORKSPACE" +./gradlew :app-ios-shared:assembleSharedReleaseXCFramework From 5ab3389700020295fc1aacaeb16f2fa313de04a5 Mon Sep 17 00:00:00 2001 From: ryoya ito Date: Sun, 13 Aug 2023 19:08:03 +0900 Subject: [PATCH 8/8] skip plugin validation --- app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh index 0e722796e..20d0356a4 100755 --- a/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh +++ b/app-ios/App/DroidKaigi2023/ci_scripts/ci_post_clone.sh @@ -6,3 +6,6 @@ export PATH="/usr/local/opt/openjdk@17/bin:$PATH" cd "$CI_WORKSPACE" ./gradlew :app-ios-shared:assembleSharedReleaseXCFramework + +# Enalbe skip plugin validation +defaults write com.apple.dt.Xcode IDESkipPackagePluginFingerprintValidatation -bool YES