Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: add core library desugaring and update ci workflow to run instrumentation test on more devices #789

Merged
merged 1 commit into from
Jul 23, 2024
Merged

fix: add core library desugaring and update ci workflow to run instrumentation test on more devices #789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ jobs:

strategy:
matrix:
api-level: [ 29 ]
target: [ google_apis ]
api-level: [25, 29] # Bug in API 21-24
target: [default, google_apis]

steps:
- name: Set up JDK 17
Expand Down
4 changes: 4 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
coreLibraryDesugaringEnabled = true
}
kotlinOptions {
jvmTarget = JavaVersion.VERSION_17
Expand All @@ -125,6 +126,9 @@ android {
dependencies {
implementation project(path: ':engine')

// Desugaring
coreLibraryDesugaring(libs.desugar.jdk.libs.nio)

// AndroidX
implementation libs.androidx.appcompat
implementation libs.androidx.constraintlayout
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
androidGradlePlugin = "8.5.1"
barista = "3.9.0"
countlySdk = "24.7.0"
desugar_jdk_libs_nio = "2.0.4"
faker = "2.0.4"
mockito = "5.12.0"
robolectric = "4.13"
Expand Down Expand Up @@ -55,6 +56,7 @@ gms-googleServices = "4.4.1"
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
barista = { module = "com.schibsted.spain:barista", version.ref = "barista" }
countly-sdk = { module = "ly.count.android:sdk", version.ref = "countlySdk" }
desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
faker = { module = "com.github.blocoio:faker", version.ref = "faker" }
robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
fastlane-screengrab = { module = "tools.fastlane:screengrab", version.ref = "fastlaneScreengrab" }
Expand Down