Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions Android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ android {
compileOptions {
sourceCompatibility = JavaVersion.toVersion(libs.versions.jvm.get())
targetCompatibility = JavaVersion.toVersion(libs.versions.jvm.get())
isCoreLibraryDesugaringEnabled = true
}

defaultConfig {
Expand Down Expand Up @@ -89,3 +90,7 @@ android {
}
}
}

dependencies {
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs_nio:2.1.4")
}
1 change: 1 addition & 0 deletions Android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<application
android:label="Skip Showcase"
android:name=".AndroidAppMain"
android:largeHeap="true"
android:allowBackup="true"
android:supportsRtl="true"
android:enableOnBackInvokedCallback="true"
Expand Down
11 changes: 11 additions & 0 deletions Sources/Showcase/Skip/skip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,14 @@ build:
contents:
# dependency used by MapPlayground for custom compose integration
- 'implementation("com.google.maps.android:maps-compose:6.4.1")'

settings:
contents:
- block: 'dependencyResolutionManagement'
contents:
- block: 'versionCatalogs'
contents:
- block: 'create("libs")'
remove: ['version("android-sdk-min", "28")']
contents:
- 'version("android-sdk-min", "24")'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than doing this, can you just manually set minSdk = 24 in the build.gradle.kts? I think the only place we reference libs.versions.android.sdk.min from the android-sdk-min version in the versionCatalogs is in the app's build.gradle.kts, so I don't think there is any point in overriding it at the version catalog level (for that matter, I wonder why we even bother setting it at all in the versionCatalogs, but we're stuck with it now since all the pre-existing app build.gradle.kts files are referencing it).