diff --git a/.github/workflows/iOSBuild.yml b/.github/workflows/iOSBuild.yml index bbfda5a44..dad6e2a13 100644 --- a/.github/workflows/iOSBuild.yml +++ b/.github/workflows/iOSBuild.yml @@ -14,6 +14,8 @@ jobs: runs-on: macos-12 steps: - uses: actions/checkout@v3 + - name: Select Xcode + run: sudo xcode-select -s '/Applications/Xcode_14.0.app' - name: Validate Gradle Wrapper uses: gradle/wrapper-validation-action@v1.0.4 - name: Copy CI gradle.properties @@ -34,12 +36,6 @@ jobs: with: name: XCFrameworks path: appioscombined.xcframework.zip - - name: Build Modules that includes plugin (Workaround for Xcode 13.x) - working-directory: app-ios - run: | - scripts/build.sh build Assets Debug - scripts/build.sh build Theme Debug - scripts/build.sh build AboutFeature Debug - name: Build App working-directory: app-ios run: | diff --git a/.github/workflows/iOSLint.yml b/.github/workflows/iOSLint.yml index cd7baae01..15bed8c2f 100644 --- a/.github/workflows/iOSLint.yml +++ b/.github/workflows/iOSLint.yml @@ -8,6 +8,8 @@ jobs: runs-on: macos-12 steps: - uses: actions/checkout@v3 + - name: Select Xcode + run: sudo xcode-select -s '/Applications/Xcode_14.0.app' - name: Run swiftlint command plugin working-directory: app-ios run: | diff --git a/app-ios/DroidKaigi2022/DroidKaigi2022.xcodeproj/project.pbxproj b/app-ios/DroidKaigi2022/DroidKaigi2022.xcodeproj/project.pbxproj index 6a7fd043b..ce4199940 100644 --- a/app-ios/DroidKaigi2022/DroidKaigi2022.xcodeproj/project.pbxproj +++ b/app-ios/DroidKaigi2022/DroidKaigi2022.xcodeproj/project.pbxproj @@ -329,7 +329,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -361,7 +361,7 @@ INFOPLIST_KEY_UILaunchScreen_Generation = YES; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 15.4; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/app-ios/Package.swift b/app-ios/Package.swift index e3030bb52..f410bada7 100644 --- a/app-ios/Package.swift +++ b/app-ios/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version: 5.6 +// swift-tools-version: 5.7 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -7,7 +7,7 @@ var package = Package( name: "DroidKaigiPackage", defaultLocalization: "en", platforms: [ - .iOS(.v15), + .iOS(.v16), ], products: [ .library(name: "AboutFeature", targets: ["AboutFeature"]), diff --git a/app-ios/scripts/build.sh b/app-ios/scripts/build.sh index 569d81fb5..2ee0ea9b0 100755 --- a/app-ios/scripts/build.sh +++ b/app-ios/scripts/build.sh @@ -5,7 +5,7 @@ SCHEME=${2} CONFIGURATION=${3} PROJECT=DroidKaigi2022/DroidKaigi2022.xcodeproj -PLATFORM_IOS="iOS Simulator,name=iPhone 13 Pro,OS=15.5" +PLATFORM_IOS="iOS Simulator,name=iPhone 14 Pro,OS=16.0" echo "⚙️ Building $SCHEME..." set -o pipefail && xcodebuild $TYPE \