Skip to content

Commit

Permalink
Cleanup separate modules
Browse files Browse the repository at this point in the history
  • Loading branch information
geoff-powell committed Dec 15, 2023
1 parent 8f3f025 commit 40d61a6
Show file tree
Hide file tree
Showing 22 changed files with 145 additions and 397 deletions.
14 changes: 9 additions & 5 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
branches:
- main
pull_request:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand All @@ -17,6 +15,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- name: set up JDK 17
uses: actions/setup-java@v4
with:
Expand All @@ -26,13 +25,15 @@ 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
steps:
- uses: actions/checkout@v4

- name: set up JDK 17
uses: actions/setup-java@v4
with:
Expand All @@ -42,13 +43,15 @@ 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
steps:
- uses: actions/checkout@v4

- name: set up JDK 17
uses: actions/setup-java@v4
with:
Expand All @@ -58,5 +61,6 @@ jobs:

- name: Grant execute permission for gradlew
run: chmod +x gradlew

- name: Build with Gradle
run: ./gradlew android:check
run: ./gradlew composeApp:testDebugUnitTest
6 changes: 2 additions & 4 deletions .github/workflows/desktop-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ on:
branches:
- main
pull_request:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
Expand All @@ -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
Expand All @@ -56,4 +54,4 @@ jobs:
node-version: '10.x'

- name: Build with Gradle
run: ./gradlew jsApp:assemble
run: ./gradlew composeApp:jsJar
38 changes: 21 additions & 17 deletions .github/workflows/ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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

Expand All @@ -29,17 +30,20 @@ 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: Log Environment Vars
run: env

- name: Copy Export Options Plist
run: base64 -d <<< "$IOS_EXPORT_OPTIONS_PLIST" > "$RUNNER_TEMP/ExportOptions.plist"

- name: Build App
run: |
cd iosApp && \
xcodebuild -scheme "iosApp" \
-archivePath $RUNNER_TEMP/iosApp.xcarchive \
-sdk iphoneos \
-configuration Debug \
-destination generic/platform=iOS \
-exportArchive \
-exportOptionsPlist $RUNNER_TEMP/ExportOptions.plist \
clean archive
3 changes: 0 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

41 changes: 0 additions & 41 deletions android/build.gradle.kts

This file was deleted.

19 changes: 0 additions & 19 deletions android/src/main/AndroidManifest.xml

This file was deleted.

21 changes: 0 additions & 21 deletions android/src/main/java/com/greenmiststudios/tidy/Application.kt

This file was deleted.

63 changes: 0 additions & 63 deletions android/src/main/java/com/greenmiststudios/tidy/MainActivity.kt

This file was deleted.

Loading

0 comments on commit 40d61a6

Please sign in to comment.