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
32 changes: 0 additions & 32 deletions .github/workflows/dependabot.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
# Run dokka and create tar
- name: Generate documentation
run: |
./gradlew dokkaHtmlMultiModule
./gradlew docs:dokkaGenerate

echo "Creating tar for generated docs"
cd $GITHUB_WORKSPACE/build/dokka/htmlMultiModule && tar cvf ~/android-maps-rx-docs.tar .
cd $GITHUB_WORKSPACE/docs/build/dokka/html && tar cvf ~/android-maps-rx-docs.tar .

echo "Unpacking tar into gh-pages branch"
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
Expand All @@ -57,5 +57,5 @@ jobs:
automerge
title: 'docs: Update docs'
body: |
Updated GitHub pages with latest from `./gradlew dokka`.
Updated GitHub pages with latest from `./gradlew docs:dokkaGenerate`.
branch: googlemaps-bot/update_gh_pages
4 changes: 1 addition & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,8 @@ name: Run unit tests
on:
repository_dispatch:
types: [test]
push:
branches-ignore: ['gh-pages']
pull_request:
branches-ignore: ['gh-pages']
branches-ignore: [ 'gh-pages' ]
workflow_dispatch:

jobs:
Expand Down
13 changes: 13 additions & 0 deletions docs/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
plugins {
kotlin("jvm") apply false
id("org.jetbrains.dokka")
}

dependencies {
dokka(project(":maps-rx"))
dokka(project(":places-rx"))
}

dokka {
moduleName.set("Maps Android Rx")
}
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
[versions]
kotlin = "2.2.0"
kotlin = "2.2.21"
rxandroid = "3.0.2"
rxjava = "3.1.8"
gradle = "8.10.1"
rxjava = "3.1.12"
gradle = "8.13.1"
jacoco-android = "0.2.1"
dokka-gradle-plugin = "2.0.0"
dokka-gradle-plugin = "2.1.0"
secrets-gradle-plugin = "2.0.1"
playServicesMaps = "19.2.0"
places = "4.3.1"
places = "5.1.1"
appCompat = "1.7.1"
lifecycleRuntimeKtx = "2.9.1"
material = "1.12.0"
lifecycleRuntimeKtx = "2.10.0"
material = "1.13.0"
rxLifecycle = "4.0.2"
mapsKtx = "5.2.0"
mapsKtx = "5.2.1"
volley = "1.2.1"
mapsRx = "1.0.0"
placesRx = "1.0.0"
gradleMavenPublishPlugin = "0.34.0"
gradleMavenPublishPlugin = "0.35.0"

[libraries]
mapsRx = { module = "com.google.maps.android:maps-rx", version.ref = "mapsRx" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
11 changes: 5 additions & 6 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ include ':maps-rx'
include ':shared'
rootProject.name = "android-maps-rx"
include ':places-rx'
include ':docs'
Loading