Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
- sphinx-maven-plugin 2.3.1 -> 2.4.0
- Build
  - Gradle 4.10.2 -> 5.4
  - plugin-publish 0.10 -> 0.10.1
  • Loading branch information
trustin committed Apr 28, 2019
1 parent 12fac41 commit c9964d1
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 12 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'com.gradle.plugin-publish' version '0.10.0'
id 'com.gradle.plugin-publish' version '0.10.1'
}

apply plugin: 'groovy'
Expand All @@ -15,7 +15,7 @@ repositories {
dependencies {
compile gradleApi()
compile localGroovy()
compile(group: 'kr.motd.maven', name: 'sphinx-maven-plugin', version: '2.3.1') {
compile(group: 'kr.motd.maven', name: 'sphinx-maven-plugin', version: '2.4.0') {
exclude group: 'org.apache.maven.shared', module: 'maven-filtering'
exclude group: 'org.apache.maven.reporting', module: 'maven-reporting-api'
exclude group: 'org.apache.maven.reporting', module: 'maven-reporting-impl'
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4-all.zip
distributionSha256Sum=f177768e7a032727e4338c8fd047f8f263e5bd283f67a7766c1ba4182c8455a6
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 17 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
#!/usr/bin/env sh

#
# Copyright 2015 the original author or authors.
#
# 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.
#

##############################################################################
##
## Gradle start up script for UN*X
Expand Down Expand Up @@ -28,7 +44,7 @@ APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
Expand Down
18 changes: 17 additions & 1 deletion gradlew.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem http://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
Expand All @@ -14,7 +30,7 @@ set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
Expand Down
6 changes: 3 additions & 3 deletions src/site/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@

project = u'sphinx-gradle-plugin'
copyright = u'2017, Trustin Lee et al'
version = '2.3'
release = '2.3.1'
version = '2.4'
release = '2.4.0'

# General options
needs_sphinx = '1.0'
master_doc = 'index'
pygments_style = 'tango'
add_function_parentheses = True

extensions = ['sphinx.ext.autodoc', 'javasphinx', 'sphinxcontrib.httpdomain',
extensions = ['sphinx.ext.autodoc', 'sphinxcontrib.httpdomain',
'sphinxcontrib.inlinesyntaxhighlight', 'sphinxcontrib.plantuml']

templates_path = ['_templates']
Expand Down
5 changes: 3 additions & 2 deletions src/site/sphinx/configuration.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,9 @@ documentation is given below:
pygments_style = 'tango'
add_function_parentheses = True
extensions = ['sphinx.ext.autodoc', 'javasphinx',
'sphinxcontrib-inlinesyntaxhighlight', 'sphinxcontrib.plantuml']
extensions = ['sphinx.ext.autodoc',
'sphinxcontrib-inlinesyntaxhighlight',
'sphinxcontrib.plantuml']
templates_path = ['_templates']
exclude_trees = ['.build']
source_suffix = ['.rst', '.md']
Expand Down
3 changes: 1 addition & 2 deletions src/site/sphinx/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ This plugin provides the following additional extensions out of the box:
- `sphinxcontrib-websupport <https://pypi.org/project/sphinxcontrib-websupport/>`_
- `sphinxcontrib-youtube <https://pypi.org/project/sphinxcontrib.youtube/>`_
- `recommonmark <https://recommonmark.readthedocs.io/>`_ + `sphinx_markdown_tables <https://github.com/ryanfox/sphinx-markdown-tables>`_
- `javasphinx <http://javasphinx.readthedocs.io/>`_

Themes
------
Expand All @@ -47,7 +46,7 @@ See `the GitHub releases page <https://github.com/trustin/sphinx-gradle-plugin/r
Credits
-------
This plugin reuses the ``SphinxRunner`` implementation of ``sphinx-maven-plugin`` originally written by
`Thomas Dudziak`_. `Bala Sridhar`_ since then upgraded Sphinx to 1.3.1 and added PlantUML and JavaSphinx
`Thomas Dudziak`_. `Bala Sridhar`_ since then upgraded Sphinx to 1.3.1 and added PlantUML
support in his fork. I'd like to appreciate their effort that did all the heavy lifting.

Read more
Expand Down

0 comments on commit c9964d1

Please sign in to comment.