Gradle 6.4

wl-net · Nov 11, 2023 · a77637e · a77637e
1 parent ca4002f
commit a77637e
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 13 deletions.
diff --git a/common/arcus-drivers/groovy-bindings/build.gradle b/common/arcus-drivers/groovy-bindings/build.gradle
@@ -165,13 +165,13 @@ task generateIpcdSource(type: JavaExec) {
 
     def outputDir = file(generatedSrcDir)
     outputs.dir outputDir
-
+    main 'com.iris.protocol.ipcd.definition.generator.ModelGenerator'
+
     doFirst {
         outputDir.mkdirs()
         println "Generating templates from $templateName..."
         classpath configurations.generator.asPath.split(':')
         args '-t', templateName, '-i', ipcdDefinitionFile, '-o', genSrcMain
-        main 'com.iris.protocol.ipcd.definition.generator.ModelGenerator'
     }
 }
 

diff --git a/common/arcus-model/platform-client/build.gradle b/common/arcus-model/platform-client/build.gradle
@@ -75,14 +75,14 @@ task generateSource(type: JavaExec) {
 
 	def outputDir = file(generatedSrcDir)
 	outputs.dir outputDir
-
+	main 'com.iris.capability.generator.java.Generator'
+
 	doFirst {
 		delete(outputDir)
 		outputDir.mkdirs()
 		println "Generating templates from $templateName..."
 		classpath configurations.generator.asPath.split(':')
 		args '-t', templateName, '-i', capabilityDir, '-o', generatedSrcDir
-		main 'com.iris.capability.generator.java.Generator'
 	}
 }
 

diff --git a/common/arcus-model/platform-messages/build.gradle b/common/arcus-model/platform-messages/build.gradle
@@ -68,14 +68,14 @@ task generateSource(type: JavaExec) {
 
 	def outputDir = file(generatedSrcDir)
 	outputs.dir outputDir
-
+	main 'com.iris.capability.generator.java.Generator'
+
 	doFirst {
 		delete(outputDir)
 		outputDir.mkdirs()
 		println "Generating templates from $templateName..."
 		classpath configurations.generator.asPath.split(':')
 		args '-t', templateName, '-i', capabilityDir, internalCapabilityDir, '-o', generatedSrcDir
-		main 'com.iris.capability.generator.java.Generator'
 	}
 }
 

diff --git a/common/arcus-protocol/build.gradle b/common/arcus-protocol/build.gradle
@@ -185,7 +185,8 @@ task generateSource(type: JavaExec) {
 
     def outputDir = file(generatedSrcDir)
     outputs.dir outputDir
-
+    main 'com.iris.capability.generator.java.Generator'
+
     doFirst {
         delete(outputDir)
         outputDir.mkdirs()
@@ -196,7 +197,6 @@ task generateSource(type: JavaExec) {
         println "Generating templates from $templateName..."
         classpath configurations.generator.asPath.split(':')
         args '-t', templateName, '-i', capabilityDir, '-o', generatedSrcDir
-        main 'com.iris.capability.generator.java.Generator'
     }
 }
 
@@ -206,12 +206,12 @@ task generateProtocolSource(type: JavaExec) {
 
     def outputDir = file(generatedSrcDir)
     outputs.dir outputDir
-
+    main 'com.iris.protocol.ipcd.definition.generator.ModelGenerator'
+
     doFirst {
         println "Generating templates from $ipcdTemplateName..."
         classpath configurations.generator.asPath.split(':')
         args '-t', ipcdTemplateName, '-i', ipcdDefinitionFile, '-o', generatedSrcDir
-        main 'com.iris.protocol.ipcd.definition.generator.ModelGenerator'
     }
 }
 
@@ -221,12 +221,12 @@ task generateAosAdapterSource(type: JavaExec) {
 
     def outputDir = file(generatedSrcDir)
     outputs.dir outputDir
-
+    main 'com.iris.protocol.ipcd.definition.generator.AosGenerator'
+
     doFirst {
         println "Generating templates from $ipcdTemplateName..."
         classpath configurations.generator.asPath.split(':')
         args '-t', aosTemplateName, '-i', aosDefinitionFile, '-o', generatedSrcDir
-        main 'com.iris.protocol.ipcd.definition.generator.AosGenerator'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git 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.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
@@ -29,6 +29,9 @@ 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="-Xmx64m" "-Xms64m"