Skip to content

Commit

Permalink
android min sdk = 21 ; [CI] android now build on mac os + add connect…
Browse files Browse the repository at this point in the history
…edCheck
  • Loading branch information
Romain Boisselle committed Jan 27, 2021
1 parent 62d19f7 commit 995e10e
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
javah = ${JAVA_HOME_8_0_265_X64}/bin/javah
excludeTargets = android

1 change: 1 addition & 0 deletions .github/conf/kodein.local.ubuntu-latest.properties
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
javah = ${JAVA_HOME_8_0_265_X64}/bin/javah
excludeTargets = android
13 changes: 10 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macOS-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
steps:
- name: Check out
uses: actions/checkout@v2
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:

build-upload-publish:
needs: build-upload
runs-on: ubuntu-latest
runs-on: macos-latest
steps:
- name: Check out
uses: actions/checkout@v2
Expand Down Expand Up @@ -99,13 +99,20 @@ jobs:
with:
java-version: 11
- name: Setup kodein.local.properties
run: cp .github/conf/kodein.local.ubuntu-latest.properties kodein.local.properties
run: cp .github/conf/kodein.local.macos-latest.properties kodein.local.properties
- name: Set up Gradle & Konan
shell: bash
run: ./gradlew
- name: Check
shell: bash
run: ./gradlew check
- name: Check Android
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
ndk: 21.3.6528147
cmake: 3.10.2.4988404
script: ./gradlew connectedCheck
- name: Upload
shell: bash
run: ./gradlew publish --stacktrace
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macOS-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
steps:
- name: Check out
uses: actions/checkout@v2
Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:

build-upload-publish:
needs: build-upload
runs-on: ubuntu-latest
runs-on: macos-latest
steps:
- name: Check out
uses: actions/checkout@v2
Expand Down Expand Up @@ -109,13 +109,20 @@ jobs:
with:
java-version: 11
- name: Setup kodein.local.properties
run: cp .github/conf/kodein.local.ubuntu-latest.properties kodein.local.properties
run: cp .github/conf/kodein.local.macos-latest.properties kodein.local.properties
- name: Set up Gradle & Konan
shell: bash
run: ./gradlew
- name: Check
shell: bash
run: ./gradlew check
- name: Check Android
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
ndk: 21.3.6528147
cmake: 3.10.2.4988404
script: ./gradlew connectedCheck
- name: Upload
shell: bash
run: ./gradlew publish -PsnapshotNumber=${{ github.run_number }} -PgitRef=${{ github.ref }} --stacktrace
Expand Down
22 changes: 15 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macOS-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- name: Check out
uses: actions/checkout@v2
Expand All @@ -36,10 +36,6 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: '8.0.265'
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Set up Windows
if: matrix.os == 'windows-latest'
run: |
Expand All @@ -51,11 +47,15 @@ jobs:
# https://youtrack.jetbrains.com/issue/KT-42485
echo "LIBCLANG_DISABLE_CRASH_RECOVERY=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
- name: Setup Android SDK dir
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'macos-latest'
run: echo sdk.dir=$ANDROID_HOME > local.properties
- name: install default NDK for AGP
if: matrix.os == 'ubuntu-latest'
if: matrix.os == 'macos-latest'
run: $ANDROID_HOME/tools/bin/sdkmanager "ndk;21.0.6113669"
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Setup kodein.local.properties
run: cp .github/conf/kodein.local.${{ matrix.os }}.properties kodein.local.properties
- name: Set up Gradle & Konan
Expand All @@ -64,3 +64,11 @@ jobs:
- name: Check
shell: bash
run: ./gradlew check
- name: Check Android
if: matrix.os == 'macos-latest'
uses: reactivecircus/android-emulator-runner@v2
with:
api-level: 29
ndk: 21.3.6528147
cmake: 3.10.2.4988404
script: ./gradlew connectedCheck
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
maven(url = "https://dl.bintray.com/kodein-framework/kodein-dev")
}
dependencies {
classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:5.3.2")
classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:5.3.3")
}
}

Expand Down

0 comments on commit 995e10e

Please sign in to comment.