Skip to content

Commit e6f8b8a

Browse files
authored
feat: updated targetSdk and compileSdk (#1428)
* feat: updated targetSdk and compileSdk * docs: added licenses * docs: excluded markdown files from header check
1 parent 7f51939 commit e6f8b8a

File tree

83 files changed

+935
-42
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+935
-42
lines changed

.github/header-checker-lint.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ sourceFileExtensions:
2727
- 'ts'
2828
- 'js'
2929
- 'java'
30-
- 'md'
3130
- 'html'
3231
- 'txt'
3332
- 'kt'

.github/snippet-bot.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Copyright 2023 Google LLC
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+

ApiDemos/java/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Android Studio’s “Build Variants” toolbar options.
1515
Pre-requisites
1616
--------------
1717

18-
- Android SDK v33
18+
- Android API level 21+
1919
- Latest Android Build Tools
2020
- Google Repository
2121
- Google Play Services

ApiDemos/java/app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ plugins {
77
}
88

99
android {
10-
compileSdk 33
10+
compileSdk 34
1111

1212
defaultConfig {
1313
applicationId "com.example.mapdemo"
1414
minSdk 19
15-
targetSdk 33
15+
targetSdk 34
1616
versionCode 1
1717
versionName "1.0"
1818
multiDexEnabled true
@@ -36,8 +36,8 @@ android {
3636
}
3737
}
3838
compileOptions {
39-
sourceCompatibility JavaVersion.VERSION_11
40-
targetCompatibility JavaVersion.VERSION_11
39+
sourceCompatibility JavaVersion.VERSION_17
40+
targetCompatibility JavaVersion.VERSION_17
4141
}
4242
namespace "com.example.mapdemo"
4343
}

ApiDemos/java/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:8.1.0'
9+
classpath 'com.android.tools.build:gradle:8.1.4'
1010
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
1111

1212
// NOTE: Do not place your application dependencies here; they belong

ApiDemos/kotlin/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Android Studio’s “Build Variants” toolbar options.
1515
Pre-requisites
1616
--------------
1717

18-
- Android SDK v33
18+
- Android API level 21+
1919
- Latest Android Build Tools
2020
- Google Repository
2121
- Google Play Services

ApiDemos/kotlin/app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ plugins {
88
}
99

1010
android {
11-
compileSdk 33
11+
compileSdk 34
1212
defaultConfig {
1313
applicationId "com.example.kotlindemos"
1414
minSdk 19
15-
targetSdk 33
15+
targetSdk 34
1616
versionCode 1
1717
versionName "1.0"
1818
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

ApiDemos/kotlin/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:8.1.0'
10+
classpath 'com.android.tools.build:gradle:8.1.4'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212
classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1"
1313

@@ -26,6 +26,6 @@ allprojects {
2626
}
2727
}
2828

29-
task clean(type: Delete) {
29+
tasks.register('clean', Delete) {
3030
delete rootProject.buildDir
3131
}

snippets/app-compose/src/main/AndroidManifest.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright 2023 Google LLC
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
218
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
319

420
<application

snippets/app-compose/src/main/java/com/example/app_compose/MapsCompose.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2023 Google LLC
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.example.app_compose
218

319
import androidx.compose.foundation.layout.Box

0 commit comments

Comments
 (0)