New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Dependency updates, JDK17 v2 #863
Changes from all commits
9af968e
2e8352f
52696b2
400fe13
1a69b5e
ed1e726
799db8d
ce48fd3
6bffaec
6ff1181
d932080
ae09780
f507113
9f32726
e0bf762
926ec0f
d6bd984
e4dbf00
b7ca117
c868942
5026089
8474272
0d6f0c5
9df93d5
612b0c4
338c1d6
7b0f740
435a8c0
9eebc92
737c54c
269a599
5fb6137
644215c
d7d4b19
2a9e7c8
b3613e8
02d2328
7a85150
8905765
626987b
ddecd9a
8f6cdc8
38b0da2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,8 +19,7 @@ jobs: | |
java-version: [ 11, 17, 18 ] # test LTS versions, and the newest | ||
kotlin-version: [ 1.5.31, 1.6.21, 1.7.10 ] | ||
kotlin-ir-enabled: [ true, false ] | ||
# in case one JDK fails, we still want to see results from others | ||
fail-fast: false | ||
fail-fast: false # in case one JDK fails, we still want to see results from others | ||
timeout-minutes: 30 | ||
steps: | ||
- uses: actions/checkout@v2 | ||
|
@@ -52,7 +51,8 @@ jobs: | |
runs-on: macos-latest | ||
strategy: | ||
matrix: | ||
api-level: [ 28, 29 ] | ||
api-level: [ 26, 28, 29 ] | ||
fail-fast: false # in case one API-level fails, we still want to see results from others | ||
timeout-minutes: 30 | ||
steps: | ||
- uses: actions/setup-java@v2 | ||
|
@@ -73,6 +73,25 @@ jobs: | |
path: ~/.gradle/wrapper | ||
key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }} | ||
|
||
- name: AVD cache | ||
uses: actions/cache@v3 | ||
id: avd-cache | ||
with: | ||
path: | | ||
~/.android/avd/* | ||
~/.android/adb* | ||
key: ${{ runner.os }}-avd-${{ matrix.api-level }} | ||
|
||
- name: create AVD and generate snapshot for caching | ||
if: steps.avd-cache.outputs.cache-hit != 'true' | ||
uses: reactivecircus/android-emulator-runner@v2 | ||
with: | ||
api-level: ${{ matrix.api-level }} | ||
force-avd-creation: false | ||
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none | ||
disable-animations: false | ||
script: echo "Generated AVD snapshot for caching." | ||
Comment on lines
+76
to
+93
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Copied from here: https://github.com/ReactiveCircus/android-emulator-runner I don't know if creating an AVD and caching it is necessary though? Do the tests need an AVD? |
||
|
||
- name: run tests | ||
uses: reactivecircus/android-emulator-runner@v2 | ||
with: | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -5,10 +5,10 @@ android: | |
- tools | ||
- platform-tools | ||
- build-tools-27.0.3 | ||
- android-28 | ||
- android-30 | ||
|
||
jdk: | ||
- oraclejdk8 | ||
- openjdk17 | ||
|
||
install: | ||
- yes | sdkmanager "ndk;20.0.5594570" | ||
Comment on lines
5
to
14
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is Travis used? Or can this config file be removed? |
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,7 @@ jobs: | |
build: | ||
working_directory: ~/code | ||
docker: | ||
- image: circleci/android:api-26-alpha | ||
- image: circleci/android:api-30 | ||
resource_class: xlarge | ||
environment: | ||
JVM_OPTS: -Xmx4096m | ||
Comment on lines
3
to
9
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Is Circle CI used? Or can this config file be removed? |
||
|
@@ -21,18 +21,18 @@ jobs: | |
name: Download Dependencies | ||
command: | | ||
sdkmanager --install 'ndk-bundle' | ||
sdkmanager --install 'platforms;android-25' | ||
sdkmanager --install 'system-images;android-25;google_apis;armeabi-v7a' | ||
sdkmanager --install 'platforms;android-30' | ||
sdkmanager --install 'system-images;android-30;google_apis;armeabi-v7a' | ||
- save_cache: | ||
paths: | ||
- ~/.gradle | ||
- ~/.m2 | ||
- /opt/android/sdk/platforms/android-25 | ||
- /opt/android/sdk/platforms/android-30 | ||
key: cache-{{ checksum ".cache-hash" }} | ||
- run: | ||
name: Starting Android emulator | ||
command: | | ||
echo no | avdmanager create avd --package "system-images;android-25;google_apis;armeabi-v7a" --name "test" | ||
echo no | avdmanager create avd --package "system-images;android-30;google_apis;armeabi-v7a" --name "test" | ||
emulator -avd test -no-skin -no-audio -no-window & | ||
android-wait-for-emulator | ||
adb shell input keyevent 82 & | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -66,7 +66,6 @@ interface InternalRef<T> { | |
val value: T | ||
} | ||
|
||
|
||
interface InternalCounter { | ||
val value: Long | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,5 +34,3 @@ tasks { | |
add("archives", sourcesJar) | ||
} | ||
} | ||
|
||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
apply plugin: 'jacoco' | ||
|
||
jacoco { | ||
toolVersion = "0.8.7" | ||
toolVersion = "0.8.8" | ||
} | ||
|
||
afterEvaluate { | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know what the best combo here is... 🤷♀️
I added 26 because that's the minimum set in the Gradle files. Maybe 28 can be removed?
The max level set in Gradle is 32, but when I set it, it failed - something about the combo not being available? ReactiveCircus/android-emulator-runner#234
Apparently 30+ is slow ReactiveCircus/android-emulator-runner#222