Skip to content

feat: modernize Java snippets module with capabilities test suite #2426

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

Merged
dkhawk merged 4 commits into from
Oct 8, 2026
Merged

feat: modernize Java snippets module with capabilities test suite #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d76b3e
feat: modernize Java snippets module with capabilities test suite
dkhawk Sep 15, 2026
3fb2f51
fix(snippets): restore dropped documentation region tags and forward …
dkhawk Sep 29, 2026
485c29a
fix(snippets-java): ensure snippet actions initialize prerequisite ma…
dkhawk Sep 30, 2026
a60e8d6
fix(snippets-java): clean up documentation region tags, snippet sorti…
dkhawk Oct 5, 2026
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
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,11 @@ jobs:

- name: Build and check
run: |
./gradlew :snippets:app:assembleDebug
./gradlew :snippets:java-app:assembleDebug
./gradlew :snippets:app-ktx:assembleDebug
./gradlew :snippets:app-utils-ktx:assembleDebug
./gradlew :snippets:app-compose:assembleDebug
./gradlew :snippets:app-places-ktx:assembleDebug
./gradlew :snippets:app-utils:assembleDebug

build-tutorials:
runs-on: ubuntu-latest
Expand Down
15 changes: 4 additions & 11 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,7 @@ jobs:
./gradlew :ApiDemos:kotlin-app:lintDebug
./gradlew :ApiDemos:java-app:lintDebug
./gradlew :ApiDemos:common-ui:lintDebug
./gradlew :snippets:app:lintGmsDebug
./gradlew :snippets:app-utils:lintDebug
./gradlew :snippets:java-app:lintDebug
./gradlew :snippets:app-utils-ktx:lintDebug
./gradlew :snippets:app-places-ktx:lintDebug
./gradlew :snippets:app-ktx:lintDebug
Expand All @@ -82,17 +81,11 @@ jobs:
sarif_file: ApiDemos/project/common-ui/build/reports/lint-results-debug.sarif
category: ApiDemos-common-ui

- name: Upload SARIF for snippets:app
- name: Upload SARIF for snippets:java-app
uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
with:
sarif_file: snippets/app/build/reports/lint-results-debug.sarif
category: snippets-app

- name: Upload SARIF for snippets:app-utils
uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
with:
sarif_file: snippets/app-utils/build/reports/lint-results-debug.sarif
category: snippets-app-utils
sarif_file: snippets/java-app/build/reports/lint-results-debug.sarif
category: snippets-java-app

- name: Upload SARIF for snippets:app-utils-ktx
uses: github/codeql-action/upload-sarif@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
Expand Down
18 changes: 2 additions & 16 deletions scripts/verify_all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ MODULES=(
":visual-testing"
":FireMarkers:app"
":WearOS:Wearable"
":snippets:app"
":snippets:app-ktx"
":snippets:app-utils-ktx"
":snippets:app-compose"
":snippets:app-places-ktx"
":snippets:java-app"
":snippets:app-utils"
":tutorials:kotlin:Polygons"
)
Expand Down Expand Up @@ -107,21 +103,11 @@ verify_module() {
local lintTask=":lintDebug"
local connectedTask=""

if [[ "$module" == ":snippets:app" ]]; then
assembleTask=":assembleGmsDebug"
testTask=":testGmsDebugUnitTest"
lintTask=":lintGmsDebug"
fi

# Define connected test task if enabled
if [ "$RUN_CONNECTED_WEAR" = true ] && [[ "$module" == ":WearOS:Wearable" ]]; then
connectedTask=":connectedDebugAndroidTest"
elif [ "$RUN_CONNECTED_MOBILE" = true ] && [[ "$module" != ":WearOS:Wearable" ]]; then
if [[ "$module" == ":snippets:app" ]]; then
connectedTask=":connectedGmsDebugAndroidTest"
else
connectedTask=":connectedDebugAndroidTest"
fi
connectedTask=":connectedDebugAndroidTest"
fi
# Note: If both flags are set, both types run (for their respective modules).

Expand Down
6 changes: 2 additions & 4 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ project(":WearOS:Wearable").projectDir = file("WearOS/Wearable")
// Snippets
include(":snippets:common")
project(":snippets:common").projectDir = file("snippets/common")
include(":snippets:app")

@LoyalAbbas LoyalAbbas Oct 5, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Need to remove ":snippets:app" and ":snippets:app-utils" from scripts/verify_all.sh file also

@dkhawk dkhawk Oct 6, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Addressed in commit 26711b29.

Updated scripts/verify_all.sh to remove references to the legacy modules :snippets:app and :snippets:app-utils, and replaced them with :snippets:java-app and :snippets:kotlin-app.

project(":snippets:app").projectDir = file("snippets/app")
include(":snippets:java-app")
project(":snippets:java-app").projectDir = file("snippets/java-app")
include(":snippets:app-ktx")
project(":snippets:app-ktx").projectDir = file("snippets/app-ktx")
include(":snippets:app-utils-ktx")
Expand All @@ -65,8 +65,6 @@ include(":snippets:app-compose")
project(":snippets:app-compose").projectDir = file("snippets/app-compose")
include(":snippets:app-places-ktx")
project(":snippets:app-places-ktx").projectDir = file("snippets/app-places-ktx")
include(":snippets:app-utils")
project(":snippets:app-utils").projectDir = file("snippets/app-utils")

// Tutorials
include(":tutorials:kotlin:Polygons")
Expand Down
2 changes: 1 addition & 1 deletion snippets/app-rx/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ dependencies {
implementation(libs.lifecycle.runtime.ktx)
implementation(libs.material)
implementation(libs.rxlifecycle.android.lifecycle.kotlin)
implementation(libs.android.maps.utils)
implementation(libs.maps.ktx)
implementation(libs.kotlin.stdlib.jdk8)
// [END_EXCLUDE silent]
}
Expand Down
1 change: 0 additions & 1 deletion snippets/app-utils/.gitignore
View file
Open in desktop

This file was deleted.

112 changes: 0 additions & 112 deletions snippets/app-utils/build.gradle.kts
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions snippets/app-utils/proguard-rules.pro
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions snippets/app-utils/src/main/AndroidManifest.xml
View file
Open in desktop

This file was deleted.

Loading
Loading