Skip to content

Commit f66620b

Browse files
authored
chore: fixed paths (googlemaps-samples#2119)
1 parent a15cb45 commit f66620b

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

.github/dependabot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
version: 2
1616
updates:
1717
- package-ecosystem: gradle
18-
directory: "/./ApiDemos/java"
18+
directory: "/./ApiDemos/project/java-app"
1919
schedule:
2020
interval: "weekly"
2121
open-pull-requests-limit: 10
2222
commit-message:
2323
prefix: chore(deps)
2424
- package-ecosystem: gradle
25-
directory: "/./ApiDemos/kotlin"
25+
directory: "/./ApiDemos/project/kotlin-app"
2626
schedule:
2727
interval: "weekly"
2828
open-pull-requests-limit: 10

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ jobs:
3535
- name: Build APKs
3636
run: |
3737
echo "Generating ApiDemos (Java) APKs"
38-
cd $GITHUB_WORKSPACE/ApiDemos/java
38+
cd $GITHUB_WORKSPACE/ApiDemos/project/
3939
./gradlew assemble
40-
cp ./app/build/outputs/apk/debug/app-debug.apk $GITHUB_WORKSPACE/ApiDemos-java-debug.apk
40+
cp ./java-app/build/outputs/apk/debug/java-app-debug.apk $GITHUB_WORKSPACE/ApiDemos-java-debug.apk
4141
4242
echo "Generating Kotlin (Kotlin) APKs"
43-
cd $GITHUB_WORKSPACE/ApiDemos/kotlin
4443
./gradlew assemble
45-
cp ./app/build/outputs/apk/debug/app-debug.apk $GITHUB_WORKSPACE/ApiDemos-kotlin-debug.apk
44+
cp ./kotlin-app/build/outputs/apk/debug/kotlin-app-debug.apk $GITHUB_WORKSPACE/ApiDemos-kotlin-debug.apk
4645
4746
- uses: actions/setup-node@v2
4847
with:

.releaserc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ plugins:
66
- - "@google/semantic-release-replace-plugin"
77
- replacements:
88
- files:
9-
- "./ApiDemos/java/app/build.gradle.kts"
10-
- "./ApiDemos/kotlin/app/build.gradle.kts"
9+
- "./ApiDemos/project/java-app/build.gradle.kts"
10+
- "./ApiDemos/project/kotlin-app/build.gradle.kts"
1111
from: "versionName = \".*\""
1212
to: "versionName = \"${nextRelease.version}\""
1313
- - "@semantic-release/git"
1414
- assets:
15-
- "./ApiDemos/java/app/build.gradle.kts"
16-
- "./ApiDemos/kotlin/app/build.gradle.kts"
15+
- "./ApiDemos/project/java-app/build.gradle.kts"
16+
- "./ApiDemos/project/kotlin-app/build.gradle.kts"
1717
- - "@semantic-release/github"
1818
- assets:
1919
- "./ApiDemos-java-debug.apk"

ApiDemos/project/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ This sample use the Gradle build system.
2828
First download the samples by cloning this repository or downloading an archived snapshot. (See the options at the top of the page.)
2929

3030
In Android Studio, use "Open an existing Android Studio project".
31-
Next select the `ApiDemos/java/` directory that you downloaded from this repository.
31+
Next select the `ApiDemos/project/` directory that you downloaded from this repository.
3232
If prompted for a gradle configuration accept the default settings.
3333

3434
Alternatively use the `gradlew build` command to build the project directly.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ dependencies {
5858
implementation(libs.coreKtx)
5959
implementation(libs.appcompat)
6060
implementation(libs.material)
61+
implementation(libs.playServicesMaps)
6162
testImplementation(libs.junit)
6263
androidTestImplementation(libs.androidxJunit)
6364
androidTestImplementation(libs.espressoCore)

0 commit comments

Comments
 (0)