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
Merged
Merged
Changes from 40 commits
Commits
Show all changes
43 commits
Select commit
Hold shift + click to select a range
9af968e
updated dependencies, jdk17
2e8352f
more updates
52696b2
added jitpack.yml
400fe13
android dependencies
1a69b5e
android build fix
ed1e726
fix for api error
799db8d
Merge remote-tracking branch 'origin/master' into feature/dependency-…
ce48fd3
jitpack fix
6bffaec
jitpack fix
6ff1181
jdk upgrades (attempt)
d932080
jdk upgrades
ae09780
use kotlin stable 1.7.0
f507113
Update gradle.properties
hduerkop 9f32726
Merge branch 'master' into feature/dependency-updates
e0bf762
more kotlin updates
926ec0f
wip
d6bd984
(potential) sync fix
e4dbf00
wip
b7ca117
wip
c868942
REVIEW REQ: ignore failing tests
5026089
Merge remote-tracking branch 'mockk/master' into feature/dependency-u…
aSemy 8474272
update readme version
aSemy 0d6f0c5
revert source/target JDK to 1.8
aSemy 9df93d5
changed Gradle version to 7.5
aSemy 612b0c4
rm jitpack config
aSemy 338c1d6
un-ignore tests
aSemy 7b0f740
bump coroutines, junit, binary-compat-validator versions
aSemy 435a8c0
experiment with re-enabling HashMap tests...
aSemy 9eebc92
rm jdk17 in build plugins
aSemy 737c54c
rm unused import
aSemy 269a599
change min/max android SDK to 26 and 32, and update test matrix
aSemy 5fb6137
rm errant 'version'
aSemy 644215c
GHA: reverted Android API levels, add specific Android caching
aSemy d7d4b19
disable 'abstract map' mocking test
aSemy 2a9e7c8
disable 'hashmap spy' test on JDK 17
aSemy b3613e8
disable hashmap spy test on JDK16+
aSemy 02d2328
test more Android API levels (matches the config in Gradle)
aSemy 7a85150
fix JRE disabled test range, add link to issue
aSemy 8905765
disable fail-fast for Android tests
aSemy 626987b
disable Android API 32, disable Android animations, copy emulator opt…
aSemy ddecd9a
re-enable animations (try to fix CI error)
aSemy 8f6cdc8
revert android emulator options
aSemy 38b0da2
add 'disabledReason' to conditional disabled
aSemy File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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? |
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 & | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,5 +34,3 @@ tasks { | |
add("archives", sourcesJar) | ||
} | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 { | ||
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
mockk/android/src/androidTest/java/io/mockk/proxy/android/AndroidMockKAgentFactoryTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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