Skip to content

Commit 06cddb6

Browse files
kikosokikoso
authored
chore: changed secrets name (#131)
* chore: changed secrets name * chore: changed secrets name * chore: set Java 17 * chore: setting T as Any * chore: moved package * chore: lint
1 parent c67cc72 commit 06cddb6

File tree

16 files changed

+54
-31
lines changed

16 files changed

+54
-31
lines changed

‎.github/workflows/release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ jobs:
4343
GPG_KEY_ARMOR: "${{ secrets.SYNCED_GPG_KEY_ARMOR }}"
4444
GPG_KEY_ID: ${{ secrets.SYNCED_GPG_KEY_ID }}
4545
GPG_PASSWORD: ${{ secrets.SYNCED_GPG_KEY_PASSWORD }}
46-
SONATYPE_PASSWORD: ${{ secrets.SYNCED_SONATYPE_PASSWORD }}
47-
SONATYPE_USERNAME: ${{ secrets.SYNCED_SONATYPE_USERNAME }}
46+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_TOKEN_PASSWORD }}
47+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_TOKEN }}
4848
- name: Semantic Release
4949
uses: cycjimmy/semantic-release-action@v3
5050
with:

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ jobs:
3636
- name: Gradle Wrapper Validation
3737
uses: gradle/[email protected]
3838

39-
- name: Set up JDK 11
39+
- name: Set up JDK 17
4040
uses: actions/setup-java@v3
4141
with:
42-
java-version: '11'
42+
java-version: '17'
4343
distribution: 'temurin'
4444

4545
- name: Build modules

‎app/build.gradle‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
plugins {
22
id 'com.android.application'
3+
id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
34
id 'kotlin-android'
4-
id 'com.google.android.secrets-gradle-plugin' version '1.1.0'
55
}
66

77
android {
8-
compileSdkVersion 31
8+
buildFeatures {
9+
buildConfig = true
10+
}
11+
12+
compileSdk 34
13+
namespace = "com.google.maps.android.rx.demo"
914

1015
defaultConfig {
1116
applicationId "com.google.maps.android.rx.demo"
1217
minSdkVersion 24
13-
targetSdkVersion 31
18+
targetSdkVersion 35
1419
versionCode 1
1520
versionName "1.0"
1621
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -43,7 +48,7 @@ dependencies {
4348
// It is recommended to also include the latest Maps SDK, Places SDK and RxJava so you
4449
// have the latest features and bug fixes.
4550
implementation "com.google.android.gms:play-services-maps:18.0.2"
46-
implementation 'com.google.android.libraries.places:places:2.5.0'
51+
implementation 'com.google.android.libraries.places:places:4.0.0'
4752
implementation 'io.reactivex.rxjava3:rxjava:3.1.4'
4853

4954
//implementation project(":maps-rx")

‎build.gradle.kts‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ buildscript {
2323
maven(url = "https://plugins.gradle.org/m2/")
2424
}
2525
dependencies {
26-
classpath("com.android.tools.build:gradle:4.2.2")
27-
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21")
26+
classpath("com.android.tools.build:gradle:8.7.1")
27+
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
28+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
2829
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.5.0")
29-
classpath("com.hiya:jacoco-android:0.2")
30+
classpath("com.mxalbert.gradle:jacoco-android:0.2.1")
3031
}
3132
}
3233

@@ -56,14 +57,28 @@ subprojects {
5657
apply(plugin = "maven-publish")
5758
apply(plugin = "org.jetbrains.dokka")
5859
apply(plugin = "signing")
59-
apply(plugin = "com.hiya.jacoco-android")
60+
apply(plugin = "com.mxalbert.gradle.jacoco-android")
61+
6062

6163
val sourcesJar = task<Jar>("sourcesJar") {
6264
archiveClassifier.set("sources")
6365
val libraryExtension = (project.androidExtension as com.android.build.gradle.LibraryExtension)
6466
from(libraryExtension.sourceSets["main"].java.srcDirs)
6567
}
6668

69+
configure<JacocoPluginExtension> {
70+
toolVersion = "0.8.7"
71+
72+
}
73+
74+
tasks.withType<Test>().configureEach {
75+
extensions.configure<JacocoTaskExtension> {
76+
isIncludeNoLocationClasses = true
77+
excludes = listOf("jdk.internal.*")
78+
}
79+
}
80+
81+
6782
val dokkaHtml = tasks.named<org.jetbrains.dokka.gradle.DokkaTask>("dokkaHtml")
6883
val dokkaJavadoc = tasks.named<org.jetbrains.dokka.gradle.DokkaTask>("dokkaJavadoc")
6984
val javadocJar = task<Jar>("javadocJar") {

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Mon Feb 22 14:51:15 PST 2021
1+
#Wed Oct 16 17:13:36 CEST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

‎maps-rx/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
android {
2-
compileSdkVersion 30
2+
namespace = "com.google.maps.android.rx.maps"
3+
4+
compileSdk 34
35

46
defaultConfig {
57
minSdkVersion 24
6-
targetSdkVersion 30
8+
targetSdkVersion 35
79
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
810
consumerProguardFiles "consumer-rules.pro"
911
}

‎maps-rx/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
limitations under the License.
1616
-->
1717

18-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
19-
package="com.google.maps.android.rx.maps">
18+
<manifest>
2019

2120
</manifest>

‎places-rx/build.gradle‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
android {
2-
compileSdkVersion 30
2+
namespace = "com.google.maps.android.rx.places"
3+
4+
compileSdk 34
35

46
defaultConfig {
57
minSdkVersion 24
6-
targetSdkVersion 30
8+
targetSdkVersion 35
79
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
810
consumerProguardFiles "consumer-rules.pro"
911
}

‎places-rx/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.google.maps.android.rx.places">
2+
<manifest>
43

54
</manifest>

‎places-rx/src/main/java/com/google/maps/android/rx/places/internal/MainThreadTaskSingle.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import io.reactivex.rxjava3.core.SingleObserver
77
/**
88
* A subclass of [Single] to be used for wrapping a [Task]
99
*/
10-
internal abstract class MainThreadTaskSingle<T> : MainThreadSingle<T>() {
10+
internal abstract class MainThreadTaskSingle<T : Any> : MainThreadSingle<T>() {
1111
override fun subscribeMainThread(observer: SingleObserver<in T>) {
1212
val cancellationTokenSource = CancellationTokenSource()
1313
val listener = TaskCompletionListener(cancellationTokenSource, observer)

0 commit comments

Comments
 (0)