Update project

.gitignore

@@ -5,4 +5,4 @@
 .idea/
 build/
 out/
-plugin/local.properties
+plugin/local.properties

.scripts/build.sh

@@ -10,4 +10,4 @@ if [[ "$TRAVIS_REPO_SLUG" == "wupdigital/android-maven-publish" && "$TRAVIS_PULL
 	./gradlew publish publishPlugins -Dgradle.publish.key=$GRADLE_KEY -Dgradle.publish.secret=$GRADLE_SECRET -c plugin/settings.gradle || exit 1
 	# Push the groovydoc
 	./gradlew gitPublishPush -c plugin/settings.gradle || exit 1
-fi
+fi

.travis.yml

@@ -16,4 +16,4 @@ cache:
   directories:
     - $HOME/.gradle/caches/
     - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache
+    - $HOME/.android/build-cache

CHANGELOG.md

@@ -54,4 +54,4 @@
 ## Version 1.0.0 (2017-07-28) [api doc](https://wupdigital.github.io/android-maven-publish/groovydoc/1.0.0/index.html)
 
 * Supports Gradle 2.4 - 3.3
-* useCompileDependencies flag
+* useCompileDependencies flag

README.md

@@ -1,33 +1,34 @@
+# android-maven-publish
+
 [![Build Status](https://travis-ci.org/wupdigital/android-maven-publish.svg?branch=master)](https://travis-ci.org/wupdigital/android-maven-publish)
 [![Coverage Status](https://coveralls.io/repos/github/wupdigital/android-maven-publish/badge.svg?branch=master)](https://coveralls.io/github/wupdigital/android-maven-publish?branch=master)
 [![License](https://img.shields.io/badge/License-Apache%202.0-green.svg)](LICENSE)
 
-# android-maven-publish
-
 **Deprecated:** This plugin is no longer needed since `maven-publish` is officially supported by AGP.
 
 Use AGP 3.6.0 or newer.
 
 ## Description
+
 Modification of the standard Maven Publish plugin to be compatible with _android-library_ projects (_aar_).
 
 ## Applying the plugin
 
-``` groovy
+```groovy
 plugins {
-    id 'digital.wup.android-maven-publish' version '3.6.2'
+    id 'digital.wup.android-maven-publish' version '3.6.3'
 }
 ```
 
 -or-
 
-``` groovy
+```groovy
 buildscript {
     repositories {
         jcenter()
     }
     dependencies {
-        classpath 'digital.wup:android-maven-publish:3.6.2'
+        classpath 'digital.wup:android-maven-publish:3.6.3'
     }
 }
 
@@ -43,7 +44,7 @@ The `android` component is used to determine which _aar_ files are published and
 
 Please refer to the standard [Maven Publish plugin documentation](https://docs.gradle.org/current/userguide/publishing_maven.html).
 
-``` groovy
+```groovy
 publishing {
     publications {
         mavenAar(MavenPublication) {
@@ -55,11 +56,10 @@ publishing {
 
 If you want to publish custom variants:
 
-``` groovy
+```groovy
 publishing {
     publications {
         android.libraryVariants.all { variant ->
-
             "maven${variant.name.capitalize()}Aar"(MavenPublication) {
                 from components.findByName("android${variant.name.capitalize()}")
                 groupId 'digital.wup.test-publish'
@@ -100,4 +100,3 @@ publishing {
     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/integTest.gradle

@@ -20,4 +20,4 @@ task integrationTest(type: Test) {
     mustRunAfter test
 }
 
-check.dependsOn integrationTest
+check.dependsOn integrationTest

gradle/shared.gradle

@@ -2,5 +2,5 @@ project.group 'digital.wup'
 project.version '3.6.4-SNAPSHOT'
 
 ext {
-    build_tools_version = '3.4.1'
-}
+    android_gradle_plugin_version = '3.6.0'
+}

gradle/testReport.gradle

@@ -29,4 +29,4 @@ jacocoTestReport {
 
     mustRunAfter 'test'
     mustRunAfter 'integrationTest'
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Tue Aug 08 18:59:15 CEST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip

gradlew

@@ -1,25 +1,59 @@
-#!/usr/bin/env bash
+#!/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
+#
+#      https://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
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 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='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +75,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -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      https://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
@@ -8,14 +24,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@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 DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 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="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +75,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line

plugin/build.gradle

@@ -21,9 +21,9 @@ repositories {
 dependencies {
     implementation gradleApi()
     implementation localGroovy()
-    compileOnly "com.android.tools.build:gradle:$build_tools_version"
+    compileOnly "com.android.tools.build:gradle:$android_gradle_plugin_version"
     testImplementation 'junit:junit:4.12'
-    integTestImplementation "com.android.tools.build:gradle:$build_tools_version"
+    integTestImplementation "com.android.tools.build:gradle:$android_gradle_plugin_version"
     integTestImplementation gradleTestKit()
     integTestImplementation('org.spockframework:spock-core:1.1-groovy-2.4') {
         exclude module: 'groovy-all'
@@ -191,4 +191,4 @@ gitPublish {
     commitMessage = "Publish groovydoc for ${project.version} version".toString()
 }
 
-gitPublishPush.enabled = isRelease()
+gitPublishPush.enabled = isRelease()

plugin/gradle.properties

@@ -1,3 +1,3 @@
 NAME = Android Maven Publish Plugin
 DESCRIPTION=Modification to the standard Maven Publish plugin to be compatible with android-library projects (aar).
-SCM_URL=github.com/wupdigital/android-maven-publish
+SCM_URL=github.com/wupdigital/android-maven-publish

plugin/settings.gradle

@@ -1 +1 @@
-rootProject.name = 'android-maven-publish'
+rootProject.name = 'android-maven-publish'

plugin/src/main/groovy/digital/wup/android_maven_publish/AndroidMavenPublishPlugin.groovy

@@ -66,4 +66,4 @@ class AndroidMavenPublishPlugin implements Plugin<Project> {
         def defaultPublishConfig = new DefaultPublishConfiguration(project)
         project.components.add(new AndroidVariantLibrary(objectFactory, configurations, attributesFactory, defaultPublishConfig))
     }
-}
+}

plugin/src/main/groovy/digital/wup/android_maven_publish/PublishConfiguration.groovy

@@ -39,4 +39,4 @@ interface PublishConfiguration {
      * @return Artifacts
      */
     Set<PublishArtifact> getArtifacts()
-}
+}

plugin/src/main/resources/META-INF/gradle-plugins/digital.wup.android-maven-publish.properties

@@ -1 +1 @@
-implementation-class=digital.wup.android_maven_publish.AndroidMavenPublishPlugin
+implementation-class=digital.wup.android_maven_publish.AndroidMavenPublishPlugin

plugin/src/test/groovy/digital/wup/android_maven_publish/DefaultPublishConfigurationTest.groovy

@@ -9,4 +9,4 @@ class DefaultPublishConfigurationTest {
     void testExample() {
         Assert.assertTrue(true)
     }
-}
+}