diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index d4069da..33d0918 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -29,4 +29,4 @@ jobs: - name: run all test run: | cd ./Samples - bundle exec fastlane all_tests + bundle exec fastlane main_tests diff --git a/Samples/Gemfile.lock b/Samples/Gemfile.lock index 385a5db..1f38718 100644 --- a/Samples/Gemfile.lock +++ b/Samples/Gemfile.lock @@ -9,18 +9,19 @@ GEM public_suffix (>= 2.0.2, < 7.0) artifactory (3.0.17) atomos (0.1.3) - aws-eventstream (1.3.1) - aws-partitions (1.1050.0) - aws-sdk-core (3.218.1) + aws-eventstream (1.3.2) + aws-partitions (1.1090.0) + aws-sdk-core (3.222.2) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.98.0) + logger + aws-sdk-kms (1.99.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.181.0) + aws-sdk-s3 (1.183.0) aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) @@ -69,7 +70,7 @@ GEM faraday_middleware (1.2.1) faraday (~> 1.0) fastimage (2.4.0) - fastlane (2.226.0) + fastlane (2.227.1) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -109,7 +110,7 @@ GEM tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.4.0) + xcpretty (~> 0.4.1) xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) fastlane-sirp (1.0.0) sysrandom (~> 1.0) @@ -130,12 +131,12 @@ GEM google-apis-core (>= 0.11.0, < 2.a) google-apis-storage_v1 (0.31.0) google-apis-core (>= 0.11.0, < 2.a) - google-cloud-core (1.7.1) + google-cloud-core (1.8.0) google-cloud-env (>= 1.0, < 3.a) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) - google-cloud-errors (1.4.0) + google-cloud-errors (1.5.0) google-cloud-storage (1.47.0) addressable (~> 2.8) digest-crc (~> 0.4) @@ -153,15 +154,18 @@ GEM highline (2.0.3) http-cookie (1.0.8) domain_name (~> 0.5) - httpclient (2.8.3) + httpclient (2.9.0) + mutex_m jmespath (1.6.2) - json (2.10.1) + json (2.10.2) jwt (2.10.1) base64 + logger (1.7.0) mini_magick (4.13.2) mini_mime (1.1.5) multi_json (1.15.0) multipart-post (2.4.1) + mutex_m (0.3.0) nanaimo (0.4.0) naturally (2.2.1) nkf (0.2.0) @@ -175,7 +179,7 @@ GEM trailblazer-option (>= 0.1.1, < 0.2.0) uber (< 0.2.0) retriable (3.1.2) - rexml (3.4.0) + rexml (3.4.1) rouge (3.28.0) ruby2_keywords (0.0.5) rubyzip (2.4.1) @@ -207,16 +211,17 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.4.0) rexml (>= 3.3.6, < 4.0) - xcpretty (0.4.0) + xcpretty (0.4.1) rouge (~> 3.28.0) xcpretty-travis-formatter (1.0.1) xcpretty (~> 0.2, >= 0.0.7) PLATFORMS + arm64-darwin-22 arm64-darwin-23 DEPENDENCIES fastlane BUNDLED WITH - 2.3.27 + 2.5.19 diff --git a/Samples/Xcode16.0/xcode16.xcodeproj/project.pbxproj b/Samples/Xcode16.0/xcode16.xcodeproj/project.pbxproj index 626ac3f..d98b547 100644 --- a/Samples/Xcode16.0/xcode16.xcodeproj/project.pbxproj +++ b/Samples/Xcode16.0/xcode16.xcodeproj/project.pbxproj @@ -14,19 +14,11 @@ remoteGlobalIDString = DAC03AB52CA90FFC00AA3D91; remoteInfo = xcode16; }; - DAC03AD22CA90FFF00AA3D91 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = DAC03AAE2CA90FFC00AA3D91 /* Project object */; - proxyType = 1; - remoteGlobalIDString = DAC03AB52CA90FFC00AA3D91; - remoteInfo = xcode16; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ DAC03AB62CA90FFC00AA3D91 /* xcode16.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = xcode16.app; sourceTree = BUILT_PRODUCTS_DIR; }; DAC03AC72CA90FFF00AA3D91 /* xcode16Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = xcode16Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - DAC03AD12CA90FFF00AA3D91 /* xcode16UITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = xcode16UITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFileSystemSynchronizedRootGroup section */ @@ -40,11 +32,6 @@ path = xcode16Tests; sourceTree = ""; }; - DAC03AD42CA90FFF00AA3D91 /* xcode16UITests */ = { - isa = PBXFileSystemSynchronizedRootGroup; - path = xcode16UITests; - sourceTree = ""; - }; /* End PBXFileSystemSynchronizedRootGroup section */ /* Begin PBXFrameworksBuildPhase section */ @@ -62,13 +49,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAC03ACE2CA90FFF00AA3D91 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -77,7 +57,6 @@ children = ( DAC03AB82CA90FFC00AA3D91 /* xcode16 */, DAC03ACA2CA90FFF00AA3D91 /* xcode16Tests */, - DAC03AD42CA90FFF00AA3D91 /* xcode16UITests */, DAC03AB72CA90FFC00AA3D91 /* Products */, ); sourceTree = ""; @@ -87,7 +66,6 @@ children = ( DAC03AB62CA90FFC00AA3D91 /* xcode16.app */, DAC03AC72CA90FFF00AA3D91 /* xcode16Tests.xctest */, - DAC03AD12CA90FFF00AA3D91 /* xcode16UITests.xctest */, ); name = Products; sourceTree = ""; @@ -140,29 +118,6 @@ productReference = DAC03AC72CA90FFF00AA3D91 /* xcode16Tests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - DAC03AD02CA90FFF00AA3D91 /* xcode16UITests */ = { - isa = PBXNativeTarget; - buildConfigurationList = DAC03AE12CA90FFF00AA3D91 /* Build configuration list for PBXNativeTarget "xcode16UITests" */; - buildPhases = ( - DAC03ACD2CA90FFF00AA3D91 /* Sources */, - DAC03ACE2CA90FFF00AA3D91 /* Frameworks */, - DAC03ACF2CA90FFF00AA3D91 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - DAC03AD32CA90FFF00AA3D91 /* PBXTargetDependency */, - ); - fileSystemSynchronizedGroups = ( - DAC03AD42CA90FFF00AA3D91 /* xcode16UITests */, - ); - name = xcode16UITests; - packageProductDependencies = ( - ); - productName = xcode16UITests; - productReference = DAC03AD12CA90FFF00AA3D91 /* xcode16UITests.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -180,10 +135,6 @@ CreatedOnToolsVersion = 16.0; TestTargetID = DAC03AB52CA90FFC00AA3D91; }; - DAC03AD02CA90FFF00AA3D91 = { - CreatedOnToolsVersion = 16.0; - TestTargetID = DAC03AB52CA90FFC00AA3D91; - }; }; }; buildConfigurationList = DAC03AB12CA90FFC00AA3D91 /* Build configuration list for PBXProject "xcode16" */; @@ -202,7 +153,6 @@ targets = ( DAC03AB52CA90FFC00AA3D91 /* xcode16 */, DAC03AC62CA90FFF00AA3D91 /* xcode16Tests */, - DAC03AD02CA90FFF00AA3D91 /* xcode16UITests */, ); }; /* End PBXProject section */ @@ -222,13 +172,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAC03ACF2CA90FFF00AA3D91 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -246,13 +189,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - DAC03ACD2CA90FFF00AA3D91 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -261,11 +197,6 @@ target = DAC03AB52CA90FFC00AA3D91 /* xcode16 */; targetProxy = DAC03AC82CA90FFF00AA3D91 /* PBXContainerItemProxy */; }; - DAC03AD32CA90FFF00AA3D91 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = DAC03AB52CA90FFC00AA3D91 /* xcode16 */; - targetProxy = DAC03AD22CA90FFF00AA3D91 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -501,48 +432,6 @@ }; name = Release; }; - DAC03AE22CA90FFF00AA3D91 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; - MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.tarappo.xcode16UITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,7"; - TEST_TARGET_NAME = xcode16; - XROS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - DAC03AE32CA90FFF00AA3D91 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 18.0; - MACOSX_DEPLOYMENT_TARGET = 14.6; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.tarappo.xcode16UITests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx xros xrsimulator"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,7"; - TEST_TARGET_NAME = xcode16; - XROS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -573,15 +462,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - DAC03AE12CA90FFF00AA3D91 /* Build configuration list for PBXNativeTarget "xcode16UITests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - DAC03AE22CA90FFF00AA3D91 /* Debug */, - DAC03AE32CA90FFF00AA3D91 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = DAC03AAE2CA90FFC00AA3D91 /* Project object */; diff --git a/Samples/Xcode16.0/xcode16UITests/xcode16UITests.swift b/Samples/Xcode16.0/xcode16UITests/xcode16UITests.swift deleted file mode 100644 index 42a8116..0000000 --- a/Samples/Xcode16.0/xcode16UITests/xcode16UITests.swift +++ /dev/null @@ -1,43 +0,0 @@ -// -// xcode16UITests.swift -// xcode16UITests -// -// Created by Toshiyuki Hirata on 2024/09/29. -// - -import XCTest - -final class xcode16UITests: XCTestCase { - - override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in the class. - - // In UI tests it is usually best to stop immediately when a failure occurs. - continueAfterFailure = false - - // In UI tests it’s important to set the initial state - such as interface orientation - required for your tests before they run. The setUp method is a good place to do this. - } - - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in the class. - } - - @MainActor - func testExample() throws { - // UI tests must launch the application that they test. - let app = XCUIApplication() - app.launch() - - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - @MainActor - func testLaunchPerformance() throws { - if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) { - // This measures how long it takes to launch your application. - measure(metrics: [XCTApplicationLaunchMetric()]) { - XCUIApplication().launch() - } - } - } -} diff --git a/Samples/Xcode16.0/xcode16UITests/xcode16UITestsLaunchTests.swift b/Samples/Xcode16.0/xcode16UITests/xcode16UITestsLaunchTests.swift deleted file mode 100644 index a1f8bd8..0000000 --- a/Samples/Xcode16.0/xcode16UITests/xcode16UITestsLaunchTests.swift +++ /dev/null @@ -1,33 +0,0 @@ -// -// xcode16UITestsLaunchTests.swift -// xcode16UITests -// -// Created by Toshiyuki Hirata on 2024/09/29. -// - -import XCTest - -final class xcode16UITestsLaunchTests: XCTestCase { - - override class var runsForEachTargetApplicationUIConfiguration: Bool { - true - } - - override func setUpWithError() throws { - continueAfterFailure = false - } - - @MainActor - func testLaunch() throws { - let app = XCUIApplication() - app.launch() - - // Insert steps here to perform after app launch but before taking a screenshot, - // such as logging into a test account or navigating somewhere in the app - - let attachment = XCTAttachment(screenshot: app.screenshot()) - attachment.name = "Launch Screen" - attachment.lifetime = .keepAlways - add(attachment) - } -}