From 9dfd6c2f0fe657c332e73b9e5bfcf007e7d52d7a Mon Sep 17 00:00:00 2001 From: Geoff Powell Date: Wed, 13 Dec 2023 21:15:12 -0500 Subject: [PATCH] Cleanup separate modules --- .github/workflows/android.yml | 8 +-- .github/workflows/desktop-web.yml | 6 +- .github/workflows/ios.yml | 30 ++++---- .idea/gradle.xml | 3 - android/build.gradle.kts | 41 ----------- android/src/main/AndroidManifest.xml | 19 ----- .../com/greenmiststudios/tidy/Application.kt | 21 ------ .../com/greenmiststudios/tidy/MainActivity.kt | 63 ---------------- .../components/screens/EditListScreen.kt | 66 +++++++++++------ composeApp/build.gradle.kts | 12 ---- .../src/iosMain/kotlin/MainViewController.kt | 9 +-- desktop/build.gradle.kts | 40 ----------- desktop/src/jvmMain/kotlin/Main.kt | 21 ------ iosApp/iosApp.xcodeproj/project.pbxproj | 4 +- .../UserInterfaceState.xcuserstate | Bin 46128 -> 48204 bytes .../xcschemes/iosApp.xcscheme | 67 ++++++++++++++++++ jsApp/build.gradle.kts | 33 --------- jsApp/src/jsMain/kotlin/main.js.kt | 17 ----- jsApp/src/jsMain/resources/index.html | 40 ----------- jsApp/src/jsMain/resources/styles.css | 14 ---- settings.gradle.kts | 5 -- 21 files changed, 131 insertions(+), 388 deletions(-) delete mode 100644 android/build.gradle.kts delete mode 100644 android/src/main/AndroidManifest.xml delete mode 100644 android/src/main/java/com/greenmiststudios/tidy/Application.kt delete mode 100644 android/src/main/java/com/greenmiststudios/tidy/MainActivity.kt delete mode 100644 desktop/build.gradle.kts delete mode 100644 desktop/src/jvmMain/kotlin/Main.kt create mode 100644 iosApp/iosApp.xcodeproj/xcuserdata/gpowell.xcuserdatad/xcschemes/iosApp.xcscheme delete mode 100644 jsApp/build.gradle.kts delete mode 100644 jsApp/src/jsMain/kotlin/main.js.kt delete mode 100644 jsApp/src/jsMain/resources/index.html delete mode 100644 jsApp/src/jsMain/resources/styles.css diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 6137d8f..840238e 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -5,8 +5,6 @@ on: branches: - main pull_request: - branches: - - main concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -27,7 +25,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew android:assembleDebug + run: ./gradlew composeApp:assembleDebug build-release: runs-on: ubuntu-latest @@ -43,7 +41,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew android:assembleRelease + run: ./gradlew composeApp:assembleRelease test: runs-on: ubuntu-latest @@ -59,4 +57,4 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew android:check \ No newline at end of file + run: ./gradlew composeApp:check \ No newline at end of file diff --git a/.github/workflows/desktop-web.yml b/.github/workflows/desktop-web.yml index 125df65..eec02d9 100644 --- a/.github/workflows/desktop-web.yml +++ b/.github/workflows/desktop-web.yml @@ -5,8 +5,6 @@ on: branches: - main pull_request: - branches: - - main concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -31,7 +29,7 @@ jobs: run: chmod +x gradlew - name: Build with Gradle - run: ./gradlew desktop:assemble + run: ./gradlew composeApp:desktopJar Build-Web: runs-on: ubuntu-latest @@ -56,4 +54,4 @@ jobs: node-version: '10.x' - name: Build with Gradle - run: ./gradlew jsApp:assemble \ No newline at end of file + run: ./gradlew composeApp:jsJar \ No newline at end of file diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index 8e7ba4f..ed2da3c 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -4,9 +4,7 @@ on: push: branches: - main - pull_request: - branches: - - main + pull_request: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -16,6 +14,9 @@ jobs: build: runs-on: macos-latest steps: + - name: Check Xcode version + run: /usr/bin/xcodebuild -version + - name: Checkout Repo uses: actions/checkout@v4 @@ -29,17 +30,12 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - shell: bash - run: ./gradlew generateDummyFramework - - - name: Set up cocoapods - uses: maxim-lobanov/setup-cocoapods@v1 - with: - version: latest - - - name: Install cocoapods - shell: bash - run: ./gradlew podInstall - - - name: Build with Gradle - run: ./gradlew iosSimulatorArm64Binaries + - name: Build App + run: | + cd iosApp && \ + xcodebuild -scheme "iosApp" \ + -archivePath $RUNNER_TEMP/iosApp.xcarchive \ + -sdk iphoneos \ + -configuration Debug \ + -destination generic/platform=iOS \ + clean archive diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 04e773a..e501606 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -8,11 +8,8 @@