Merge pull request #76 from CristianGM/gradle-6.4

Gradle 6.4

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelist
 Items listed here may not be exhaustive, if you are seeing issues, check the git commits for more specific change information &| open an issue.
 
+## 1.0.0-rc07
+- Gradle 6.4 compatibility
+
 ## 1.0.0-rc06
 - Print output for `adb install` commands. #59 thanks [@plastiv](https://github.com/plastiv).
 - Update Gradle, AGP, and Kotlin to latest stable versions. `6.3`,`3.6.2`,`1.3.71` respectively.

README.md

@@ -192,6 +192,7 @@ Composer plugin version | Gradle version | Android plugin version
 | ------     | ------             | ------ |
 | 0.13.0     | 5.6                | 3.4.2, 3.5.0-rc01<sup>\*</sup>, 3.6.0-alpha05<sup>\*</sup> |
 | 1.0.0-rc06 | 6.3                | 3.6.2, 4.0.0-beta04<sup>\*</sup>, 4.1.0-alpha05<sup>\*</sup> |
+| 1.0.0-rc07 | 6.4                | 3.6.2, 4.0.0-beta04<sup>\*</sup>, 4.1.0-alpha05<sup>\*</sup> |
 
 \* Alpha, Beta and RC versions of the android plugin are quickly tested by building against them.
 This usually means the published composer plugin will work with those version 

build.gradle

@@ -21,7 +21,7 @@ buildscript {
     google()
   }
   dependencies {
-    classpath("org.gradle.kotlin:plugins:1.3.3")
+    classpath("org.gradle.kotlin:plugins:1.3.6")
     classpath("com.gradle.publish:plugin-publish-plugin:0.11.0")
     classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION")
     classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4")

gradle.properties

@@ -16,7 +16,7 @@
 
 group=com.trevjonez.composer
 
-CGP_VERSION=1.0.0-rc06
+CGP_VERSION=1.0.0-rc07
 
 AGP_VERSION=3.6.2
 #AGP_VERSION=4.0.0-beta04
@@ -25,7 +25,7 @@ AGP_VERSION=3.6.2
 MIN_SDK=23
 COMPILE_SDK=29
 
-KOTLIN_VERSION=1.3.71
+KOTLIN_VERSION=1.3.72
 
 org.gradle.caching=true
 org.gradle.parallel=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -129,6 +130,7 @@ fi
 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

gradlew.bat

@@ -84,6 +84,7 @@ set CMD_LINE_ARGS=%*
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
 "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 

plugin/src/main/kotlin/com/trevjonez/composer/ComposerConfig.kt

@@ -24,7 +24,7 @@ import org.gradle.api.artifacts.Configuration
 object ComposerConfig {
     const val MAIN_CLASS = "com.gojuno.composer.MainKt"
     const val COMPOSER = "composer"
-    const val COMPOSER_VER = "1.0.0-rc06"
+    const val COMPOSER_VER = "1.0.0-rc07"
     const val ARTIFACT_DEP = "com.trevjonez.composer:composer:$COMPOSER_VER"
     const val DEFAULT_OUTPUT_DIR = "composer-output"
 }

plugin/src/main/kotlin/com/trevjonez/composer/ComposerTask.kt

@@ -83,6 +83,8 @@ abstract class ComposerTask : JavaExec(), ComposerConfigurator, ComposerTaskDsl
   init {
     apk.convention(testApk)
     outputDir.convention(project.layout.buildDirectory.dir(ComposerConfig.DEFAULT_OUTPUT_DIR))
+    mainClass.set(MAIN_CLASS)
+    classpath = configuration
   }
 
   override fun exec() {
@@ -114,8 +116,6 @@ abstract class ComposerTask : JavaExec(), ComposerConfigurator, ComposerTaskDsl
           it.joinToString(prefix = "ComposerTask: args: =`", postfix = "`")
       )
     }
-    main = MAIN_CLASS
-    classpath = configuration
 
     try {
       super.exec()