refactor: created multiple modules

.github/workflows/build.yml

@@ -32,100 +32,92 @@ jobs:
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: set up Java 21
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: '21'
 
     - name: Build and check
       run: |
-        cd ApiDemos
-        for dir in ./*/ ; do 
-          if [[ "$dir" != "./resources/" ]]; then 
-            ( cd "$dir" && ./gradlew buildDebugPreBundle ) 
-          fi 
-        done
+        ./gradlew :ApiDemos:java-app:assembleDebug
+        ./gradlew :ApiDemos:kotlin-app:assembleDebug
+        ./gradlew :ApiDemos:common-ui:assembleDebug
 
 
   build-WearOS:
     runs-on: ubuntu-latest
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: set up Java 21
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: '21'
 
     - name: Build and check
-      run: cd WearOS && ./gradlew build
+      run: ./gradlew :WearOS:Wearable:assembleDebug
 
   build-FireMarkers:
     runs-on: ubuntu-latest
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: set up Java 21
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: '21'
 
     - name: Build and check
-      run: cd FireMarkers && ./gradlew build
+      run: ./gradlew :FireMarkers:app:assembleDebug
 
   build-Snippets:
     runs-on: ubuntu-latest
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: set up Java 21
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: '21'
 
     - name: Build and check
       run: |
-        cd snippets
-        ./gradlew assembleDebug lintDebug
+        ./gradlew :snippets: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-rx:assembleDebug
+        ./gradlew :snippets:app-utils:assembleDebug
 
   build-tutorials:
     runs-on: ubuntu-latest
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: set up Java 21
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         distribution: 'adopt'
         java-version: '21'
 
     - name: Build and check
       run: |
-        cd tutorials
-        for dir in ./*/
-        do
-          cd "$dir"
-          for tutorial in ./*/
-          do
-            cd "$tutorial" && ./gradlew buildDebug
-            cd ..
-          done
-          cd ..
-        done
+        ./gradlew :tutorials:kotlin:Polygons:assembleDebug
 
   test: # used as required status check
     runs-on: ubuntu-latest

.github/workflows/generate-v3.yml

@@ -25,28 +25,27 @@ jobs:
     timeout-minutes: 45
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
-    - name: set up JDK 1.8
-      uses: actions/setup-java@v1
+    - name: set up JDK 17
+      uses: actions/setup-java@v4
       with:
-        java-version: 1.8
+        distribution: 'adopt'
+        java-version: 17
 
     - name: Install NDK
       run: |
-        sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;20.0.5594570"
+        sudo ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "ndk;20.0.5594570"
 
     - name: Generate V3
       id: gradlew-generate-v3
       run: |
-        cd ApiDemos/java
-        ./gradlew generateV3 generateV3Layout
-        cd ../kotlin
-        ./gradlew generateV3 generateV3Layout
-        echo "::set-output name=files-changed::$(git status -s | wc -l)"
+        ./gradlew :ApiDemos:java-app:generateV3 :ApiDemos:java-app:generateV3Layout
+        ./gradlew :ApiDemos:kotlin-app:generateV3 :ApiDemos:kotlin-app:generateV3Layout
+        echo "files-changed=$(git status -s | wc -l)" >> $GITHUB_OUTPUT
 
     - name: PR Changes
-      uses: peter-evans/create-pull-request@v2
+      uses: peter-evans/create-pull-request@v6
       if: steps.gradlew-generate-v3.outputs.files-changed > 0
       with:
         token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
@@ -57,6 +56,7 @@ jobs:
         body: |
             Generating V3 code via `./gradlew generateV3 generateV3Layout`
         branch: googlemaps-bot/generate-v3
+
     - name: Uninstall NDK
       run: |
-        ${ANDROID_HOME}/tools/bin/sdkmanager --uninstall 'ndk-bundle'
+        ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --uninstall 'ndk;20.0.5594570'

.github/workflows/lint.yml

@@ -25,129 +25,96 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'adopt'
           java-version: '17'
 
-      - name: Run Android Lint for ApiDemos/project/kotlin-app
-        run: ./gradlew :kotlin-app:lintDebug
-        working-directory: ApiDemos/project
-
-      - name: Upload SARIF for ApiDemos/project/kotlin-app
+      - name: Run Android Lint
+        run: |
+          ./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:app-utils-ktx:lintDebug
+          ./gradlew :snippets:app-rx:lintDebug
+          ./gradlew :snippets:app-places-ktx:lintDebug
+          ./gradlew :snippets:app-ktx:lintDebug
+          ./gradlew :snippets:app-compose:lintDebug
+          ./gradlew :WearOS:Wearable:lintDebug
+          ./gradlew :FireMarkers:app:lintDebug
+
+      - name: Upload SARIF for ApiDemos:kotlin-app
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ApiDemos/project/kotlin-app/build/reports/lint-results-debug.sarif
           category: ApiDemos-kotlin-app
 
-      - name: Run Android Lint for ApiDemos/project/java-app
-        run: ./gradlew :java-app:lintDebug
-        working-directory: ApiDemos/project
-
-      - name: Upload SARIF for ApiDemos/project/java-app
+      - name: Upload SARIF for ApiDemos:java-app
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ApiDemos/project/java-app/build/reports/lint-results-debug.sarif
           category: ApiDemos-java-app
 
-      - name: Run Android Lint for ApiDemos/project/common-ui
-        run: ./gradlew :common-ui:lintDebug
-        working-directory: ApiDemos/project
-
-      - name: Upload SARIF for ApiDemos/project/common-ui
+      - name: Upload SARIF for ApiDemos:common-ui
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: ApiDemos/project/common-ui/build/reports/lint-results-debug.sarif
           category: ApiDemos-common-ui
 
-      - name: Run Android Lint for snippets/app
-        run: ./gradlew :app:lintGmsDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app
+      - name: Upload SARIF for snippets:app
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app/build/reports/lint-results-debug.sarif
           category: snippets-app
 
-      - name: Run Android Lint for snippets/app-utils
-        run: ./gradlew :app-utils:lintDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app-utils
+      - name: Upload SARIF for snippets:app-utils
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app-utils/build/reports/lint-results-debug.sarif
           category: snippets-app-utils
 
-      - name: Run Android Lint for snippets/app-utils-ktx
-        run: ./gradlew :app-utils-ktx:lintDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app-utils-ktx
+      - name: Upload SARIF for snippets:app-utils-ktx
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app-utils-ktx/build/reports/lint-results-debug.sarif
           category: snippets-app-utils-ktx
 
-      - name: Run Android Lint for snippets/app-rx
-        run: ./gradlew :app-rx:lintDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app-rx
+      - name: Upload SARIF for snippets:app-rx
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app-rx/build/reports/lint-results-debug.sarif
           category: snippets-app-rx
 
-      - name: Run Android Lint for snippets/app-places-ktx
-        run: ./gradlew :app-places-ktx:lintDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app-places-ktx
+      - name: Upload SARIF for snippets:app-places-ktx
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app-places-ktx/build/reports/lint-results-debug.sarif
           category: snippets-app-places-ktx
 
-      - name: Run Android Lint for snippets/app-ktx
-        run: ./gradlew :app-ktx:lintDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app-ktx
+      - name: Upload SARIF for snippets:app-ktx
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app-ktx/build/reports/lint-results-debug.sarif
           category: snippets-app-ktx
 
-      - name: Run Android Lint for snippets/app-compose
-        run: ./gradlew :app-compose:lintDebug
-        working-directory: snippets
-
-      - name: Upload SARIF for snippets/app-compose
+      - name: Upload SARIF for snippets:app-compose
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: snippets/app-compose/build/reports/lint-results-debug.sarif
           category: snippets-app-compose
 
-      - name: Run Android Lint for WearOS/Wearable
-        run: ./gradlew :Wearable:lintDebug
-        working-directory: WearOS
-
-      - name: Upload SARIF for WearOS/Wearable
+      - name: Upload SARIF for WearOS:Wearable
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: WearOS/Wearable/build/reports/lint-results-debug.sarif
           category: WearOS-Wearable
 
-      - name: Run Android Lint for FireMarkers/app
-        run: ./gradlew :app:lintDebug
-        working-directory: FireMarkers
-
-      - name: Upload SARIF for FireMarkers/app
+      - name: Upload SARIF for FireMarkers:app
         uses: github/codeql-action/upload-sarif@v3
         with:
           sarif_file: FireMarkers/app/build/reports/lint-results-debug.sarif

ApiDemos/project/common-ui/build.gradle.kts

@@ -17,8 +17,8 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.android")
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
 }
 
 android {
@@ -66,11 +66,11 @@ android {
 
 dependencies {
 
-    implementation(libs.coreKtx)
+    implementation(libs.core.ktx)
     implementation(libs.appcompat)
     implementation(libs.material)
-    implementation(libs.playServicesMaps)
+    implementation(libs.play.services.maps)
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidxJunit)
-    androidTestImplementation(libs.espressoCore)
+    androidTestImplementation(libs.junit)
+    androidTestImplementation(libs.espresso.core)
 }