From 7873c4de97b897357a188d711e38a54a25967fbc Mon Sep 17 00:00:00 2001 From: Christian De Angelis Date: Fri, 26 Apr 2024 01:20:55 -0400 Subject: [PATCH] Fix iOS build --- .github/workflows/ci.yml | 13 +++++++------ app/iosApp/ozone/ContentView.swift | 4 ++-- app/iosApp/ozone/ozoneApp.swift | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd90b30..cea12d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,14 +45,15 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'temurin' - java-version: '17' - check-latest: true - name: Assemble iOS - run: ./gradlew clean :app:ios:iosSimulatorArm64MainKlibrary --no-daemon --stacktrace + uses: mxcl/xcodebuild@v1 + with: + platform: iOS + action: build + scheme: ozone + configuration: debug + working-directory: app/iosApp/ assemble-js: runs-on: ubuntu-latest diff --git a/app/iosApp/ozone/ContentView.swift b/app/iosApp/ozone/ContentView.swift index 7b395a5..5f0957a 100644 --- a/app/iosApp/ozone/ContentView.swift +++ b/app/iosApp/ozone/ContentView.swift @@ -1,5 +1,5 @@ import SwiftUI -import ios +import OzoneIos struct ContentView: View { var body: some View { @@ -9,7 +9,7 @@ struct ContentView: View { struct ComposeViewControllerToSwiftUI: UIViewControllerRepresentable { func makeUIViewController(context: Context) -> UIViewController { - return ios.MainViewControllerKt.MainViewController() + return OzoneIos.MainViewControllerKt.MainViewController() } func updateUIViewController(_ uiViewController: UIViewController, context: Context) { diff --git a/app/iosApp/ozone/ozoneApp.swift b/app/iosApp/ozone/ozoneApp.swift index 36caf04..913954a 100644 --- a/app/iosApp/ozone/ozoneApp.swift +++ b/app/iosApp/ozone/ozoneApp.swift @@ -1,10 +1,10 @@ import SwiftUI -import ios +import OzoneIos @main struct ozoneApp: App { init() { - ios.MainViewControllerKt.initialize() + OzoneIos.MainViewControllerKt.initialize() } var body: some Scene {