diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index cf62ae62..c902b116 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -9,10 +9,6 @@ on: permissions: contents: read -env: - GRADLE_OPTS: "-Xms128m" - CI: true - jobs: build: runs-on: ubuntu-latest diff --git a/build.gradle b/build.gradle index da845f1c..04c7a407 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,19 @@ +buildscript { + repositories { + maven { url "https://plugins.gradle.org/m2/" } // Mirrors jcenter() and mavenCentral() + } + + dependencies { + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' + classpath "com.gradle.publish:plugin-publish-plugin:0.11.0" + classpath "com.github.ben-manes:gradle-versions-plugin:0.12.0" + } +} + +plugins { + id "org.gradle.kotlin.kotlin-dsl" version "1.4.9" +} + println """\ Welcome to Gradle $gradle.gradleVersion - http://www.gradle.org Gradle home is set to: $gradle.gradleHomeDir @@ -11,10 +27,8 @@ apply plugin: 'codenarc' apply plugin: 'idea' apply plugin: 'eclipse' apply plugin: 'groovy' -apply plugin: 'kotlin' apply plugin: 'maven' apply plugin: 'signing' -apply plugin: 'java-gradle-plugin' apply plugin: 'com.jfrog.bintray' apply plugin: 'com.gradle.plugin-publish' apply plugin: 'com.github.ben-manes.versions' @@ -24,19 +38,6 @@ version = '0.8.18-SNAPSHOT' ext.isReleaseVersion = !version.endsWith("SNAPSHOT") -buildscript { - repositories { - maven { url "https://plugins.gradle.org/m2/" } // Mirrors jcenter() and mavenCentral() - } - - dependencies { - classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6' - classpath "com.gradle.publish:plugin-publish-plugin:0.11.0" - classpath "com.github.ben-manes:gradle-versions-plugin:0.12.0" - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20" - } -} - repositories { maven { url "https://plugins.gradle.org/m2/" } maven { url "https://repo.gradle.org/gradle/libs-releases-local/" } @@ -52,7 +53,6 @@ configurations { } dependencies { - compileOnly "org.gradle:gradle-kotlin-dsl:1.0.4" compileOnly "com.android.tools.build:gradle:3.5.0" compile 'com.google.guava:guava:27.0.1-jre' @@ -93,6 +93,10 @@ artifacts { archives javadocJar } +codenarc { + toolVersion = "1.4" +} + // The Gradle plugin portal doesn't allow signature files. if (!gradle.startParameter.taskNames.intersect(['publishPlugins'])) { signing { @@ -178,10 +182,10 @@ if (System.env.CI == 'true') { // Required in order to support building a mixed kotlin/groovy project. With out this, // we would get a cyclic dependency error, since both compileKotlin and compileGroovy // depend on compileJava. -// https://discuss.gradle.org/t/kotlin-groovy-and-java-compilation/14903/10 -project.afterEvaluate { - compileGroovy.dependsOn = compileGroovy.taskDependencies.mutableValues - 'compileJava' - compileKotlin.dependsOn compileGroovy - compileKotlin.classpath += files(compileGroovy.destinationDir) - classes.dependsOn compileKotlin +// See https://github.com/gradle/gradle/pull/11513 and https://discuss.gradle.org/t/kotlin-groovy-and-java-compilation/14903/10 +tasks.named('compileGroovy') { + classpath = sourceSets.main.compileClasspath +} +tasks.named('compileKotlin') { + compileKotlin.classpath += files(compileGroovy.destinationDirectory) } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1948b907..e708b1c0 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 c9efb682..3ab0b725 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip diff --git a/gradlew b/gradlew index cccdd3d5..4f906e0c 100755 --- a/gradlew +++ b/gradlew @@ -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 +# +# 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 @@ -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" @@ -66,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 @@ -109,10 +126,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 @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +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" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6..ac1b06f9 100644 --- a/gradlew.bat +++ b/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 @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @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 set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line 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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/groovy/com/google/protobuf/gradle/KtDslCompatibilityUtils.java b/src/main/groovy/com/google/protobuf/gradle/KtDslCompatibilityUtils.java deleted file mode 100644 index 969b1df3..00000000 --- a/src/main/groovy/com/google/protobuf/gradle/KtDslCompatibilityUtils.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.google.protobuf.gradle; - -import kotlin.Unit; -import kotlin.jvm.functions.Function1; -import org.gradle.api.NamedDomainObjectContainer; -import org.gradle.kotlin.dsl.NamedDomainObjectContainerExtensionsKt; -import org.gradle.kotlin.dsl.NamedDomainObjectContainerScope; - -public class KtDslCompatibilityUtils { - - /** - * This method is used to delegate the NamedDomainObjectContainer configuration to - * to which ever kotlin-dsl ext implementation is available on the classpath. - * - * Since NamedDomainObjectContainerExtensionsKt.invoke is an inline extension function, our - * usages in 'ProtobufConfiguratorExts.kt' would use the byte code for which ever kotlin-dsl - * version we compiled against. This caused issues with providing compatibility with - * kotlin-dsl 1.0.0-rc3 and 1.0.4 (Stable). - * - * Since the kotlin compiler creates a static implementations of all extensions, we can create a - * delegating utility function that ensures we are not inline-ing our kotlin-dsl compilation - * target byte code. - * - * @param container Container to apply the scope configuration - * @param block A kotlin lambda to apply to the NamedDomainObjectContainerScope - * @return A NamedDomainObjectContainer with the block lambda applied to is NamedDomainObjectContainerScope - */ - static NamedDomainObjectContainer configureNamedDomainObjectContainer( - NamedDomainObjectContainer container, - Function1, Unit> block){ - - return NamedDomainObjectContainerExtensionsKt.invoke(container, block); - } -} diff --git a/src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt b/src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt index 4b163a0d..7270b672 100644 --- a/src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt +++ b/src/main/kotlin/com/google/protobuf/gradle/ProtobufConfiguratorExts.kt @@ -9,6 +9,7 @@ import org.gradle.api.tasks.SourceSet import org.gradle.kotlin.dsl.NamedDomainObjectContainerScope import org.gradle.kotlin.dsl.closureOf import org.gradle.kotlin.dsl.get +import org.gradle.kotlin.dsl.invoke /** * Applies the supplied action to the project's instance of [ProtobufConfigurator]. @@ -120,7 +121,7 @@ fun ProtobufConfigurator.protoc(action: ExecutableLocator.() -> Unit) { fun ProtobufConfigurator.plugins(action: NamedDomainObjectContainerScope.() -> Unit) { plugins(closureOf> { - KtDslCompatibilityUtils.configureNamedDomainObjectContainer(this, action) + this.invoke(action) }) } @@ -130,13 +131,13 @@ fun ProtobufConfigurator.generateProtoTasks(action: ProtobufConfigurator.Generat fun GenerateProtoTask.builtins(action: NamedDomainObjectContainerScope.()->Unit) { builtins(closureOf> { - KtDslCompatibilityUtils.configureNamedDomainObjectContainer(this, action) + this.invoke(action) }) } fun GenerateProtoTask.plugins(action: NamedDomainObjectContainerScope.()-> Unit) { plugins(closureOf> { - KtDslCompatibilityUtils.configureNamedDomainObjectContainer(this, action) + this.invoke(action) }) } @@ -164,7 +165,7 @@ fun GenerateProtoTask.plugins(action: NamedDomainObjectContainerScope NamedDomainObjectContainerScope.id(id: String, action: (T.() -> Unit)? = null) { - action?.let { create(id, closureOf(it)) } + action?.let { create(id, it) } ?: create(id) }