Merge 67447e9 into 60ca660

apache · Mar 23, 2023 · 770fc71 · 770fc71
2 parents 60ca660 + 67447e9
commit 770fc71
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 27 deletions.
diff --git a/build.gradle b/build.gradle
@@ -17,7 +17,7 @@
 
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
     dependencies {
         classpath "cz.alenkacz:gradle-scalafmt:${gradle.scalafmt.version}"
@@ -101,7 +101,7 @@ subprojects {
         if (project.plugins.hasPlugin('application')) {
             //Ensure that dist archive name does not contain version
             distTar {
-                archiveName = "${project.name}.tar"
+                archiveFileName = "${project.name}.tar"
             }
 
             //Avoid generating the zip files from maven installations

diff --git a/core/scheduler/build.gradle b/core/scheduler/build.gradle
@@ -66,6 +66,9 @@ dependencies {
         resolutionStrategy.force "com.typesafe.akka:akka-http-spray-json_${gradle.scala.depVersion}:${gradle.akka_http.version}"
         resolutionStrategy.force "com.typesafe.akka:akka-parsing_${gradle.scala.depVersion}:${gradle.akka_http.version}"
         resolutionStrategy.force "com.typesafe.akka:akka-http_${gradle.scala.depVersion}:${gradle.akka_http.version}"
+        resolutionStrategy.dependencySubstitution {
+            substitute module("com.google.protobuf:protoc") using module("com.google.protobuf:protoc:${gradle.protoc.version}") because "previous versions didn't target M1 architecture"
+        }
     }
     implementation "org.scala-lang:scala-library:${gradle.scala.version}"
     implementation project(':common:scala')

diff --git a/core/standalone/build.gradle b/core/standalone/build.gradle
@@ -22,7 +22,8 @@ plugins {
     id 'org.scoverage'
     id 'org.springframework.boot' version '2.1.6.RELEASE'
     id 'scala'
-    id 'com.gorylenko.gradle-git-properties' version '2.0.0'
+    id 'com.gorylenko.gradle-git-properties' version '2.4.1'
+    id "de.undercouch.download" version "5.3.1"
 }
 
 ext.dockerImageName = 'standalone'
@@ -37,30 +38,40 @@ scoverage {
     scoverageScalaVersion.set("${gradle.scala.scoverageScalaVersion}")
 }
 
+task downloadSwagger(type: Download) {
+    src "https://github.com/swagger-api/swagger-ui/archive/v${gradle.swagger.version}.tar.gz"
+    dest file("$buildDir/tmp/swagger/swagger-ui.tar")
+    overwrite false
+}
+
+
 task copySwagger(type: Copy) {
-    def version = "3.6.0"
+    dependsOn(downloadSwagger)
     mkdir("$buildDir/tmp/swagger")
     def destFile = file("$buildDir/tmp/swagger/swagger-ui.tar")
     def uiDir = file("$buildDir/tmp/swagger/swagger-ui")
-    if (!destFile.exists()) {
-        ant.get(src: "https://github.com/swagger-api/swagger-ui/archive/v${version}.tar.gz", dest: destFile)
-    }
     from(tarTree(resources.gzip(destFile))){
-        include("swagger-ui-${version}/dist/**")
+        include("swagger-ui-${gradle.swagger.version}/dist/**")
     }
     into(uiDir)
     includeEmptyDirs = false
-    project.ext.swaggerUiDir = file("$buildDir/tmp/swagger/swagger-ui/swagger-ui-${version}/dist")
+    project.ext.swaggerUiDir = file("$buildDir/tmp/swagger/swagger-ui/swagger-ui-${gradle.swagger.version}/dist")
 }
 
 def apiGwActions = ['createApi', "deleteApi", "getApi"]
 
-task copyGWActions() {
+task copyGWActions {
+    def routeMgmtDir = new File(project.projectDir, "../routemgmt")
+    def routeBuildDir = mkdir("$buildDir/tmp/routemgmt")
+
+    apiGwActions.each {
+        inputs.dir(new File(routeMgmtDir, it))
+        outputs.dir(new File(routeBuildDir, it + ".zip"))
+    }
+
     doLast {
-        def routeMgmtDir = new File(project.projectDir, "../routemgmt")
-        def commonDir = new File(routeMgmtDir, "common")
-        def routeBuildDir = mkdir("$buildDir/tmp/routemgmt")
         apiGwActions.each { actionName ->
+            def commonDir = new File(routeMgmtDir, "common")
             def zipFileName = actionName + ".zip"
             def actionDir = new File(routeMgmtDir, actionName)
             def zipFile = new File(routeBuildDir, zipFileName)
@@ -88,19 +99,12 @@ task copyGWActions() {
     }
 }
 
-task copyGrafanaConfig() {
-    doLast {
-        def grafanaDir = new File(project(':core:monitoring:user-events').projectDir, "compose/grafana")
-        def grafanaBuildDir = mkdir("$buildDir/tmp/grafana")
-        def zipFileName = "grafana-config.zip"
-        def zipFile = new File(grafanaBuildDir, zipFileName)
-        if (!zipFile.exists()) {
-            ant.zip(destfile:zipFile){
-                fileset(dir:grafanaDir)
-            }
-            logger.info("Created grafana config zip $zipFileName")
-        }
-    }
+task copyGrafanaConfig(type: Zip) {
+    def grafanaBuildDir = mkdir("$buildDir/tmp/grafana")
+    def grafanaDir = new File(project(':core:monitoring:user-events').projectDir, "compose/grafana")
+    from grafanaDir
+    archiveFileName.set("grafana-config.zip")
+    destinationDirectory.set(grafanaBuildDir)
 }
 
 processResources.dependsOn copySwagger

diff --git a/settings.gradle b/settings.gradle
@@ -16,7 +16,7 @@
  */
 
 plugins {
-    id "com.gradle.enterprise" version "3.10.2"
+    id "com.gradle.enterprise" version "3.12.4"
 }
 
 gradleEnterprise {
@@ -86,3 +86,7 @@ gradle.ext.curator = [version : '4.3.0']
 gradle.ext.kube_client = [version: '4.10.3']
 
 gradle.ext.netty = [version : '4.1.87.Final']
+
+gradle.ext.protoc = [version : '3.18.0']
+
+gradle.ext.swagger = [version : '3.6.0']