Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
  • Loading branch information
pushpalroy committed Sep 6, 2024
2 parents 8fda0e0 + 9919603 commit a79717c
Show file tree
Hide file tree
Showing 213 changed files with 5,890 additions and 1,430 deletions.
23 changes: 0 additions & 23 deletions .github/workflows/android_build.yaml

This file was deleted.

34 changes: 0 additions & 34 deletions .github/workflows/android_tests.yaml

This file was deleted.

118 changes: 118 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
name: Build

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]
types: [ opened, synchronize, reopened, ready_for_review ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
buildAndroid:
name: Build Android
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false

steps:
# Code checkout
- name: Checkout code
id: checkout_code
uses: actions/checkout@v4

# Setup Java and Gradle
- name: Java and Gradle set up
uses: ./.github/workflows/setup/java-setup

# Grant execute permission for script
- name: Grant execute permission for script
id: grant_script_permission
shell: bash
run: chmod +x ./scripts/build_android.sh

# Build and verify Android
- name: Build and verify Android
run: ./scripts/build_android.sh

buildiOS:
name: Build iOS
runs-on: macos-latest
if: github.event.pull_request.draft == false

steps:
# Code checkout
- name: Checkout code
id: checkout_code
uses: actions/checkout@v4

# Setup Java and Gradle
- name: Java and Gradle set up
uses: ./.github/workflows/setup/java-setup

# Grant execute permission for script
- name: Grant execute permission for script
id: grant_script_permission
shell: bash
run: chmod +x ./scripts/build_android.sh

# Setup iOS
- name: iOS set up
uses: ./.github/workflows/setup/ios-setup

# Build iOS app
- name: Build iOS app
id: build_ios_debug
run: xcodebuild build -workspace sample/iosApp/iosApp.xcworkspace -configuration Debug -scheme iosApp -sdk iphonesimulator -verbose

buildWeb:
name: Build Web
runs-on: ubuntu-latest
if: github.event.pull_request.draft == false

steps:
# Code checkout
- name: Checkout code
id: checkout_code
uses: actions/checkout@v4

# Setup Java and Gradle
- name: Java and Gradle set up
uses: ./.github/workflows/setup/java-setup

# Grant execute permission for script
- name: Grant execute permission for script
id: grant_script_permission
shell: bash
run: chmod +x ./scripts/build_web.sh

# Build and verify Web
- name: Build and verify Web
run: ./scripts/build_web.sh

buildMacOS:
name: Build MacOS
runs-on: macos-latest
if: github.event.pull_request.draft == false

steps:
# Code checkout
- name: Checkout code
id: checkout_code
uses: actions/checkout@v4

# Setup Java and Gradle
- name: Java and Gradle set up
uses: ./.github/workflows/setup/java-setup

# Grant execute permission for script
- name: Grant execute permission for script
id: grant_script_permission
shell: bash
run: chmod +x ./scripts/build_macos.sh

# Build and verify MacOS
- name: Build and verify MacOS
run: ./scripts/build_macos.sh
18 changes: 18 additions & 0 deletions .github/workflows/setup/ios-setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: iOS set up
description: Sets up Kotlin Native and Cocoapods
runs:
using: "composite"
steps:
- shell: bash
run: ./gradlew :sample:composeApp:generateDummyFramework

- name: Set up cocoapods
uses: maxim-lobanov/setup-cocoapods@v1
with:
version: latest

- shell: bash
name: Install Dependencies
run: |
cd sample/iosApp
pod install --verbose
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Android and Gradle Job Setup
description: Sets up Android and Gradle
name: Java and Gradle Job Setup
description: Sets up Java and Gradle
runs:
using: "composite"
steps:
Expand All @@ -8,7 +8,7 @@ runs:
id: setup_jdk
uses: actions/setup-java@v4
with:
distribution: "zulu"
distribution: "corretto"
java-version: 17

# Grant execute permission for gradlew
Expand All @@ -27,4 +27,9 @@ runs:
~/.gradle/wrapper
key: ${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}-${{ hashFiles('**/buildSrc/**/*.kt') }}
restore-keys: |
${{ runner.os }}-gradle-
${{ runner.os }}-gradle-
# Setup Gradle
- name: Set up Gradle
id: set_up_gradle
uses: gradle/actions/setup-gradle@v4
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@
# Java class files
*.class

# Kotlin libraries
.kotlin/

app/
distributions/

# Generated files
bin/
gen/
Expand Down Expand Up @@ -41,8 +47,6 @@ captures/
*.iml
.idea/

.kotlin/

# Keystore files
# Uncomment the following lines if you do not want to check your keystore files in.
#*.jks
Expand Down
2 changes: 0 additions & 2 deletions app/.gitignore

This file was deleted.

96 changes: 0 additions & 96 deletions app/build.gradle.kts

This file was deleted.

21 changes: 0 additions & 21 deletions app/proguard-rules.pro

This file was deleted.

Loading

0 comments on commit a79717c

Please sign in to comment.