Skip to content

Commit f9e3c7e

Browse files
committed
docs: updated Dokka version
1 parent 5024e68 commit f9e3c7e

File tree

9 files changed

+34
-53
lines changed

9 files changed

+34
-53
lines changed

.github/workflows/dependabot.yml

Lines changed: 0 additions & 32 deletions
This file was deleted.

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
# Run dokka and create tar
3535
- name: Generate documentation
3636
run: |
37-
./gradlew dokkaHtmlMultiModule
37+
./gradlew docs:dokkaGenerate
3838
3939
echo "Creating tar for generated docs"
40-
cd $GITHUB_WORKSPACE/build/dokka/htmlMultiModule && tar cvf ~/android-maps-rx-docs.tar .
40+
cd $GITHUB_WORKSPACE/docs/build/dokka/html && tar cvf ~/android-maps-rx-docs.tar .
4141
4242
echo "Unpacking tar into gh-pages branch"
4343
git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
@@ -57,5 +57,5 @@ jobs:
5757
automerge
5858
title: 'docs: Update docs'
5959
body: |
60-
Updated GitHub pages with latest from `./gradlew dokka`.
60+
Updated GitHub pages with latest from `./gradlew docs:dokkaGenerate`.
6161
branch: googlemaps-bot/update_gh_pages

docs/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
plugins {
2+
kotlin("jvm") apply false
3+
id("org.jetbrains.dokka")
4+
}
5+
6+
dependencies {
7+
dokka(project(":maps-rx"))
8+
dokka(project(":places-rx"))
9+
}
10+
11+
dokka {
12+
moduleName.set("Maps Android Rx")
13+
}

gradle/libs.versions.toml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
[versions]
2-
kotlin = "2.2.0"
2+
kotlin = "2.2.21"
33
rxandroid = "3.0.2"
4-
rxjava = "3.1.8"
5-
gradle = "8.10.1"
4+
rxjava = "3.1.12"
5+
gradle = "8.13.1"
66
jacoco-android = "0.2.1"
7-
dokka-gradle-plugin = "2.0.0"
7+
dokka-gradle-plugin = "2.1.0"
88
secrets-gradle-plugin = "2.0.1"
99
playServicesMaps = "19.2.0"
10-
places = "4.3.1"
10+
places = "5.1.1"
1111
appCompat = "1.7.1"
12-
lifecycleRuntimeKtx = "2.9.1"
13-
material = "1.12.0"
12+
lifecycleRuntimeKtx = "2.10.0"
13+
material = "1.13.0"
1414
rxLifecycle = "4.0.2"
15-
mapsKtx = "5.2.0"
15+
mapsKtx = "5.2.1"
1616
volley = "1.2.1"
1717
mapsRx = "1.0.0"
1818
placesRx = "1.0.0"
19-
gradleMavenPublishPlugin = "0.34.0"
19+
gradleMavenPublishPlugin = "0.35.0"
2020

2121
[libraries]
2222
mapsRx = { module = "com.google.maps.android:maps-rx", version.ref = "mapsRx" }

gradle/wrapper/gradle-wrapper.jar

1.83 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

33
#
4-
# Copyright © 2015-2021 the original authors.
4+
# Copyright © 2015 the original authors.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -86,8 +86,7 @@ done
8686
# shellcheck disable=SC2034
8787
APP_BASE_NAME=${0##*/}
8888
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89-
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90-
' "$PWD" ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
9190

9291
# Use the maximum available, or set MAX_FD != -1 to use that value.
9392
MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in #(
115114
NONSTOP* ) nonstop=true ;;
116115
esac
117116

118-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
119118

120119

121120
# Determine the Java command to use to start the JVM.
@@ -206,15 +205,15 @@ fi
206205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207206

208207
# Collect all arguments for the java command:
209-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210209
# and any embedded shellness will be escaped.
211210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212211
# treated as '${Hostname}' itself on the command line.
213212

214213
set -- \
215214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
216215
-classpath "$CLASSPATH" \
217-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
218217
"$@"
219218

220219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ goto fail
7070
:execute
7171
@rem Setup the command line
7272

73-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7474

7575

7676
@rem Execute Gradle
77-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7878

7979
:end
8080
@rem End local scope for the variables with windows NT shell

settings.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ include ':maps-rx'
33
include ':shared'
44
rootProject.name = "android-maps-rx"
55
include ':places-rx'
6+
include ':docs'

0 commit comments

Comments
 (0)