diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml deleted file mode 100644 index 6b46ebb..0000000 --- a/.github/workflows/dependabot.yml +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2022 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -name: Dependabot -on: pull_request - -permissions: - contents: write - -jobs: - dependabot: - runs-on: ubuntu-latest - if: ${{ github.actor == 'dependabot[bot]' }} - env: - PR_URL: ${{github.event.pull_request.html_url}} - GITHUB_TOKEN: ${{secrets.SYNCED_GITHUB_TOKEN_REPO}} - steps: - - name: approve - run: gh pr review --approve "$PR_URL" - - name: merge - run: gh pr merge --auto --squash --delete-branch "$PR_URL" diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 50f1ecb..6c29d19 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -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/* @@ -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 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5232e0c..13d846a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -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: diff --git a/docs/build.gradle.kts b/docs/build.gradle.kts new file mode 100644 index 0000000..4b28c90 --- /dev/null +++ b/docs/build.gradle.kts @@ -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") +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ec8f74..52bee65 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9..8bdaf60 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2847c8..2a84e18 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index f5feea6..ef07e01 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9b42019..5eed7ee 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%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" %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle index 64c638d..192f2a9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,3 +3,4 @@ include ':maps-rx' include ':shared' rootProject.name = "android-maps-rx" include ':places-rx' +include ':docs'