Skip to content

Commit abcc8b5

Browse files
dkhawkkikoso
andauthored
feat: copies some snippets that were in v3 only to gms (#1715)
* feat: copies some snippets that were in v3 only to gms chore: the java compatibility version * fix: updates copyright dates and adds missing copyright * fix: copyright header for strings.xml * fix: set Java Version back to 17 * fix: set Java Version back to 17 * fix: set Java Version back to 17 * fix: set Java Version back to 17 * fix: set Java Version back to 17 * feat: creates AdvancedMarkersCollisionActivity to demonstrate marker collision behavior * chore: not adding jar files in libs directory * feat: set Java 21 everywhere --------- Co-authored-by: Enrique López Mañas <[email protected]>
1 parent 4297488 commit abcc8b5

File tree

23 files changed

+349
-52
lines changed

23 files changed

+349
-52
lines changed

.github/workflows/build.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ jobs:
3636
steps:
3737
- uses: actions/checkout@v2
3838

39-
- name: set up Java 17
39+
- name: set up Java 21
4040
uses: actions/setup-java@v2
4141
with:
4242
distribution: 'adopt'
43-
java-version: '17'
43+
java-version: '21'
4444

4545
- name: Build and check
4646
run: |
@@ -54,11 +54,11 @@ jobs:
5454
steps:
5555
- uses: actions/checkout@v2
5656

57-
- name: set up Java 17
57+
- name: set up Java 21
5858
uses: actions/setup-java@v2
5959
with:
6060
distribution: 'adopt'
61-
java-version: '17'
61+
java-version: '21'
6262

6363
- name: Build and check
6464
run: cd WearOS && ./gradlew build
@@ -70,11 +70,11 @@ jobs:
7070
steps:
7171
- uses: actions/checkout@v2
7272

73-
- name: set up Java 17
73+
- name: set up Java 21
7474
uses: actions/setup-java@v2
7575
with:
7676
distribution: 'adopt'
77-
java-version: '17'
77+
java-version: '21'
7878

7979
- name: Build and check
8080
run: |
@@ -88,11 +88,11 @@ jobs:
8888
steps:
8989
- uses: actions/checkout@v2
9090

91-
- name: set up Java 17
91+
- name: set up Java 21
9292
uses: actions/setup-java@v2
9393
with:
9494
distribution: 'adopt'
95-
java-version: '17'
95+
java-version: '21'
9696

9797
- name: Build and check
9898
run: |

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ jobs:
2626
with:
2727
token: ${{ secrets.SYNCED_GITHUB_TOKEN_REPO }}
2828

29-
- name: set up Java 17
29+
- name: set up Java 21
3030
uses: actions/setup-java@v3
3131
with:
3232
distribution: 'temurin'
33-
java-version: '17'
33+
java-version: '21'
3434

3535
- name: Build APKs
3636
run: |

ApiDemos/java/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ android {
3636
}
3737
}
3838
compileOptions {
39-
sourceCompatibility JavaVersion.VERSION_17
40-
targetCompatibility JavaVersion.VERSION_17
39+
sourceCompatibility JavaVersion.VERSION_21
40+
targetCompatibility JavaVersion.VERSION_21
4141
}
4242
namespace "com.example.mapdemo"
4343
}

ApiDemos/kotlin/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ android {
3636
}
3737
}
3838
compileOptions {
39-
sourceCompatibility JavaVersion.VERSION_17
40-
targetCompatibility JavaVersion.VERSION_17
39+
sourceCompatibility JavaVersion.VERSION_21
40+
targetCompatibility JavaVersion.VERSION_21
4141
}
4242
lintOptions {
4343
abortOnError false

WearOS/Wearable/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,16 @@ android {
3939
namespace 'com.example.wearosmap'
4040

4141
kotlinOptions {
42-
jvmTarget = "17"
42+
jvmTarget = "21"
4343
}
4444
kotlin {
45-
jvmToolchain(17)
45+
jvmToolchain(21)
4646
}
4747
}
4848

4949
// [START maps_wear_os_dependencies]
5050
dependencies {
5151
// [START_EXCLUDE]
52-
implementation fileTree(dir: 'libs', include: ['*.jar'])
5352
implementation "androidx.core:core-ktx:1.13.1"
5453
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.0'
5554
// [END_EXCLUDE]

snippets/app-compose/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,18 @@ android {
3232
buildConfig = true
3333
}
3434
compileOptions {
35-
sourceCompatibility JavaVersion.VERSION_1_8
36-
targetCompatibility JavaVersion.VERSION_1_8
35+
sourceCompatibility JavaVersion.VERSION_21
36+
targetCompatibility JavaVersion.VERSION_21
3737
}
3838
kotlinOptions {
39-
jvmTarget = '1.8'
39+
jvmTarget = '21'
4040
}
4141
}
4242

4343
// [START maps_android_compose_dependency]
4444
dependencies {
4545

4646
// [START_EXCLUDE silent]
47-
implementation fileTree(dir: "libs", include: ["*.jar"])
4847
implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0'
4948
implementation 'androidx.core:core-ktx:1.13.1'
5049
implementation 'androidx.appcompat:appcompat:1.7.0'

snippets/app-ktx/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ android {
3131
}
3232
}
3333
compileOptions {
34-
sourceCompatibility JavaVersion.VERSION_1_8
35-
targetCompatibility JavaVersion.VERSION_1_8
34+
sourceCompatibility JavaVersion.VERSION_21
35+
targetCompatibility JavaVersion.VERSION_21
3636
}
3737
kotlinOptions {
38-
jvmTarget = '1.8'
38+
jvmTarget = '21'
3939
}
4040
}
4141

snippets/app-places-ktx/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ android {
2929
}
3030
}
3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_21
33+
targetCompatibility JavaVersion.VERSION_21
3434
}
3535
kotlinOptions {
36-
jvmTarget = '1.8'
36+
jvmTarget = '21'
3737
}
3838
}
3939
// [START places_android_ktx_install_snippet]

snippets/app-rx/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ android {
2929
}
3030
}
3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_21
33+
targetCompatibility JavaVersion.VERSION_21
3434
}
3535
kotlinOptions {
36-
jvmTarget = '1.8'
36+
jvmTarget = '21'
3737
}
3838
}
3939

snippets/app-utils-ktx/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ android {
2929
}
3030
}
3131
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
32+
sourceCompatibility JavaVersion.VERSION_21
33+
targetCompatibility JavaVersion.VERSION_21
3434
}
3535
kotlinOptions {
36-
jvmTarget = '1.8'
36+
jvmTarget = '21'
3737
}
3838
}
3939

0 commit comments

Comments
 (0)