Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
uses: actions/checkout@v3

- name: Gradle Wrapper Validation
uses: gradle/wrapper-validation[email protected]
uses: gradle/actions/wrapper-validation@v3

- name: Set up JDK 17
uses: actions/setup-java@v3
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ dependencies {
implementation(libs.rxLifecycle)
implementation(libs.mapsKtx)
implementation(libs.kotlinStdlib)

}

secrets {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.maps.android.rx.demo">

<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand All @@ -26,6 +26,7 @@
android:supportsRtl="true"
android:theme="@style/Theme.MapsRxDemo">


<activity
android:name=".MainActivity"
android:label="@string/app_name"
Expand Down
12 changes: 6 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ buildscript {
maven(url = "https://plugins.gradle.org/m2/")
}
dependencies {
classpath("com.android.tools.build:gradle:8.7.2")
classpath("com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.9.20")
classpath("com.mxalbert.gradle:jacoco-android:0.2.1")
classpath(libs.gradle)
classpath(libs.secrets.gradle.plugin)
classpath(libs.kotlin.gradle.plugin)
classpath(libs.dokka.gradle.plugin)
classpath(libs.jacoco.android)
}
}

plugins {
`maven-publish`
signing
id("org.jetbrains.dokka") version "1.5.0"
id("org.jetbrains.dokka") version "2.0.0"
}

// Shared configs across subprojects
Expand Down
21 changes: 15 additions & 6 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
[versions]
kotlin = "2.0.21"
kotlin = "2.2.0"
rxandroid = "3.0.2"
rxjava = "3.1.8"
playServicesMaps = "19.0.0"
places = "4.1.0"
appCompat = "1.7.0"
lifecycleRuntimeKtx = "2.8.7"
gradle = "8.10.1"
jacoco-android = "0.2.1"
dokka-gradle-plugin = "2.0.0"
secrets-gradle-plugin = "2.0.1"
playServicesMaps = "19.2.0"
places = "4.3.1"
appCompat = "1.7.1"
lifecycleRuntimeKtx = "2.9.1"
material = "1.12.0"
rxLifecycle = "4.0.2"
mapsKtx = "5.1.1"
mapsKtx = "5.2.0"
volley = "1.2.1"
mapsRx = "1.0.0"
placesRx = "1.0.0"
Expand All @@ -28,3 +32,8 @@ material = { module = "com.google.android.material:material", version.ref = "mat
rxLifecycle = { module = "com.trello.rxlifecycle4:rxlifecycle-android-lifecycle-kotlin", version.ref = "rxLifecycle" }
mapsKtx = { module = "com.google.maps.android:maps-ktx", version.ref = "mapsKtx" }
volley = { module = "com.android.volley:volley", version.ref = "volley" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
dokka-gradle-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "dokka-gradle-plugin" }
jacoco-android = { module = "com.mxalbert.gradle:jacoco-android", version.ref = "jacoco-android" }
secrets-gradle-plugin = { module = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin", version.ref = "secrets-gradle-plugin" }
gradle = { module = "com.android.tools.build:gradle", version.ref = "gradle" }
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Wed Oct 16 17:13:36 CEST 2024
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading