Skip to content

Bumping to gradle 6 #5276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 28, 2022
Merged

Bumping to gradle 6 #5276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
63ef150
Bump graddle
upgle Jul 7, 2022
384c577
Use implementation instead of compile
upgle Jul 16, 2022
1735bc0
Bump to gradle 6.5
upgle Jul 17, 2022
a33d692
Remove distDockerCoverage.dependsOn scoverageClasses
upgle Jul 17, 2022
1094ac3
Fix com.lihaoyi:fastparse dependency version conflicts
upgle Jul 18, 2022
512dfdd
Bump to gradle 6.9.1
upgle Jul 19, 2022
e8ad7e1
Bump to scoverage 7.0.0
upgle Jul 27, 2022
65b84bf
Add dependsOn 'compileScoverageScala'
upgle Jul 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,7 @@ buildscript {
}

plugins {
id "com.gradle.build-scan" version "2.3"
id "org.scoverage" version "4.0.1" apply false
}


buildScan {
termsOfServiceUrl = 'https://gradle.com/terms-of-service'
termsOfServiceAgree = 'yes'
publishAlwaysIf(System.getenv('CI') != null)
id "org.scoverage" version "7.0.0" apply false
}

subprojects {
Expand Down
98 changes: 49 additions & 49 deletions common/scala/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
id 'maven'
id 'org.scoverage'
id 'scala'
id 'java-library'
}

ext.dockerImageName = 'scala'
Expand All @@ -28,80 +29,79 @@ apply from: '../../gradle/docker.gradle'
project.archivesBaseName = "openwhisk-common"

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
api "org.scala-lang:scala-library:${gradle.scala.version}"

compile ("com.github.pureconfig:pureconfig_${gradle.scala.depVersion}:0.11.1") {
api ("com.github.pureconfig:pureconfig_${gradle.scala.depVersion}:0.11.1") {
exclude group: 'org.scala-lang', module: 'scala-compiler'
exclude group: 'org.scala-lang', module: 'scala-reflect'
}
compile "io.spray:spray-json_${gradle.scala.depVersion}:1.3.5"
compile "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.1.3"

compile "com.typesafe.akka:akka-actor_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "com.typesafe.akka:akka-slf4j_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "com.typesafe.akka:akka-cluster_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "com.typesafe.akka:akka-cluster-metrics_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "com.typesafe.akka:akka-cluster-tools_${gradle.scala.depVersion}:${gradle.akka.version}"
compile "com.typesafe.akka:akka-distributed-data_${gradle.scala.depVersion}:${gradle.akka.version}"

compile "com.typesafe.akka:akka-http-core_${gradle.scala.depVersion}:${gradle.akka_http.version}"
compile "com.typesafe.akka:akka-http-spray-json_${gradle.scala.depVersion}:${gradle.akka_http.version}"

compile "com.lightbend.akka:akka-stream-alpakka-file_${gradle.scala.depVersion}:1.1.2"

compile "ch.qos.logback:logback-classic:1.2.3"
compile "org.slf4j:jcl-over-slf4j:1.7.25"
compile "org.slf4j:log4j-over-slf4j:1.7.25"
compile "commons-codec:commons-codec:1.9"
compile "commons-io:commons-io:2.6"
compile "commons-collections:commons-collections:3.2.2"
compile "org.apache.kafka:kafka-clients:2.4.0"
compile "org.apache.httpcomponents:httpclient:4.5.5"
compile "com.fasterxml.uuid:java-uuid-generator:3.1.3"
compile "com.github.ben-manes.caffeine:caffeine:2.6.2"
compile "com.google.code.findbugs:jsr305:3.0.2"
compile "io.fabric8:kubernetes-client:${gradle.kube_client.version}"
api "io.spray:spray-json_${gradle.scala.depVersion}:1.3.5"
api "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.3.0"
api "com.typesafe.akka:akka-actor_${gradle.scala.depVersion}:${gradle.akka.version}"
api "com.typesafe.akka:akka-stream_${gradle.scala.depVersion}:${gradle.akka.version}"
api "com.typesafe.akka:akka-slf4j_${gradle.scala.depVersion}:${gradle.akka.version}"
api "com.typesafe.akka:akka-cluster_${gradle.scala.depVersion}:${gradle.akka.version}"
api "com.typesafe.akka:akka-cluster-metrics_${gradle.scala.depVersion}:${gradle.akka.version}"
api "com.typesafe.akka:akka-cluster-tools_${gradle.scala.depVersion}:${gradle.akka.version}"
api "com.typesafe.akka:akka-distributed-data_${gradle.scala.depVersion}:${gradle.akka.version}"

api "com.typesafe.akka:akka-http-core_${gradle.scala.depVersion}:${gradle.akka_http.version}"
api "com.typesafe.akka:akka-http-spray-json_${gradle.scala.depVersion}:${gradle.akka_http.version}"

api "com.lightbend.akka:akka-stream-alpakka-file_${gradle.scala.depVersion}:1.1.2"

api "ch.qos.logback:logback-classic:1.2.3"
api "org.slf4j:jcl-over-slf4j:1.7.25"
api "org.slf4j:log4j-over-slf4j:1.7.25"
api "commons-codec:commons-codec:1.9"
api "commons-io:commons-io:2.6"
api "commons-collections:commons-collections:3.2.2"
api "org.apache.kafka:kafka-clients:2.4.0"
api "org.apache.httpcomponents:httpclient:4.5.5"
api "com.fasterxml.uuid:java-uuid-generator:3.1.3"
api "com.github.ben-manes.caffeine:caffeine:2.6.2"
api "com.google.code.findbugs:jsr305:3.0.2"
api "io.fabric8:kubernetes-client:${gradle.kube_client.version}"

//metrics
compile ("io.kamon:kamon-core_${gradle.scala.depVersion}:2.1.12") {
api ("io.kamon:kamon-core_${gradle.scala.depVersion}:2.1.12") {
exclude group: 'com.lihaoyi'
}
compile "io.kamon:kamon-statsd_${gradle.scala.depVersion}:2.1.12"
compile ("io.kamon:kamon-system-metrics_${gradle.scala.depVersion}:2.1.12") {
api "io.kamon:kamon-statsd_${gradle.scala.depVersion}:2.1.12"
api ("io.kamon:kamon-system-metrics_${gradle.scala.depVersion}:2.1.12") {
exclude group: 'io.kamon', module: 'sigar-loader'
}
compile "io.kamon:kamon-prometheus_${gradle.scala.depVersion}:2.1.12"
compile "io.kamon:kamon-datadog_${gradle.scala.depVersion}:2.1.12"
api "io.kamon:kamon-prometheus_${gradle.scala.depVersion}:2.1.12"
api "io.kamon:kamon-datadog_${gradle.scala.depVersion}:2.1.12"

// for etcd
compile("com.ibm.etcd:etcd-java:0.0.13")
api "com.ibm.etcd:etcd-java:0.0.13"

//tracing support
compile "io.opentracing:opentracing-api:0.31.0"
compile "io.opentracing:opentracing-util:0.31.0"
compile ("io.opentracing.brave:brave-opentracing:0.31.0") {
api "io.opentracing:opentracing-api:0.31.0"
api "io.opentracing:opentracing-util:0.31.0"
api ("io.opentracing.brave:brave-opentracing:0.31.0") {
exclude group: 'io.zipkin.brave', module:'brave-tests'
}
compile "io.zipkin.reporter2:zipkin-sender-okhttp3:2.6.1"
compile "io.zipkin.reporter2:zipkin-reporter:2.6.1"
api "io.zipkin.reporter2:zipkin-sender-okhttp3:2.6.1"
api "io.zipkin.reporter2:zipkin-reporter:2.6.1"

compile "io.reactivex:rxjava:1.3.8"
compile "io.reactivex:rxjava-reactive-streams:1.2.1"
compile "com.microsoft.azure:azure-cosmosdb:2.6.2"
api "io.reactivex:rxjava:1.3.8"
api "io.reactivex:rxjava-reactive-streams:1.2.1"
api "com.microsoft.azure:azure-cosmosdb:2.6.2"

compile "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.4"
api "com.sksamuel.elastic4s:elastic4s-http_${gradle.scala.depVersion}:6.7.4"
//for mongo
compile "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0"
api "org.mongodb.scala:mongo-scala-driver_${gradle.scala.depVersion}:2.7.0"

compile ("com.lightbend.akka:akka-stream-alpakka-s3_${gradle.scala.depVersion}:1.1.2") {
api ("com.lightbend.akka:akka-stream-alpakka-s3_${gradle.scala.depVersion}:1.1.2") {
exclude group: 'org.apache.httpcomponents' //Not used as alpakka uses akka-http
exclude group: 'com.fasterxml.jackson.core'
exclude group: 'com.fasterxml.jackson.dataformat'
}
compile "com.amazonaws:aws-java-sdk-cloudfront:1.11.517"
api "com.amazonaws:aws-java-sdk-cloudfront:1.11.517"

compile ("com.azure:azure-storage-blob:12.7.0") {
api ("com.azure:azure-storage-blob:12.7.0") {
exclude group: "com.azure", module: "azure-core-test"
}
}
Expand Down
14 changes: 8 additions & 6 deletions core/controller/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ ext.coverageDirs = [
distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses'

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile "com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:${gradle.akka_management.version}"
compile "com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:${gradle.akka_management.version}"
compile "com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:${gradle.akka_management.version}"
compile project(':common:scala')
compile project(':core:invoker')
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation project(':common:scala')
implementation project(':core:invoker')
implementation project(':core:scheduler')

implementation "com.lightbend.akka.management:akka-management-cluster-bootstrap_${gradle.scala.depVersion}:${gradle.akka_management.version}"
implementation "com.lightbend.akka.discovery:akka-discovery-kubernetes-api_${gradle.scala.depVersion}:${gradle.akka_management.version}"
implementation "com.lightbend.akka.discovery:akka-discovery-marathon-api_${gradle.scala.depVersion}:${gradle.akka_management.version}"
}

mainClassName = "org.apache.openwhisk.core.controller.Controller"
Expand Down
1 change: 0 additions & 1 deletion core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import org.apache.openwhisk.common._
import org.apache.openwhisk.core.WhiskConfig._
import org.apache.openwhisk.core.connector._
import org.apache.openwhisk.core.containerpool.ContainerPoolConfig
import org.apache.openwhisk.core.entity.ControllerInstanceId
import org.apache.openwhisk.core.entity._
import org.apache.openwhisk.core.invoker.InvokerProvider
import org.apache.openwhisk.core.{ConfigKeys, WhiskConfig}
Expand Down
8 changes: 4 additions & 4 deletions core/cosmosdb/cache-invalidator/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
project.archivesBaseName = "openwhisk-cache-invalidator-cosmosdb"

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile (project(':common:scala')) {
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation (project(':common:scala')) {
exclude group: 'com.microsoft.azure', module:'azure-cosmosdb'
}
compile "com.microsoft.azure:azure-cosmos:3.5.0"
compile "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
implementation "com.microsoft.azure:azure-cosmos:3.5.0"
implementation "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
}

mainClassName = "org.apache.openwhisk.core.database.cosmosdb.cache.Main"
10 changes: 5 additions & 5 deletions core/invoker/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ ext.coverageDirs = [
distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses'

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile project(':common:scala')
compile project(':core:scheduler')
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation project(':common:scala')
implementation project(':core:scheduler')

compile ("org.apache.curator:curator-recipes:${gradle.curator.version}") {
implementation ("org.apache.curator:curator-recipes:${gradle.curator.version}") {
exclude group: 'org.apache.zookeeper', module:'zookeeper'
}
compile ("org.apache.zookeeper:zookeeper:3.4.11") {
implementation ("org.apache.zookeeper:zookeeper:3.4.11") {
exclude group: 'org.slf4j'
exclude group: 'log4j'
exclude group: 'jline'
Expand Down
24 changes: 12 additions & 12 deletions core/monitoring/user-events/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,21 @@ distDocker.dependsOn ':common:scala:distDocker', 'distTar'
project.archivesBaseName = "openwhisk-user-events"

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile project(':common:scala')
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation project(':common:scala')

compile "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
implementation "com.typesafe.akka:akka-stream-kafka_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"

compile "io.prometheus:simpleclient:0.6.0"
compile "io.prometheus:simpleclient_common:0.6.0"
implementation "io.prometheus:simpleclient:0.6.0"
implementation "io.prometheus:simpleclient_common:0.6.0"

testCompile "junit:junit:4.11"
testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
testCompile "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0"
testCompile "com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
testCompile "com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
testCompile "com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
testCompile "com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}"
testImplementation "junit:junit:4.11"
testImplementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
testImplementation "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0"
testImplementation "com.typesafe.akka:akka-stream-kafka-testkit_${gradle.scala.depVersion}:${gradle.akka_kafka.version}"
testImplementation "com.typesafe.akka:akka-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
testImplementation "com.typesafe.akka:akka-stream-testkit_${gradle.scala.depVersion}:${gradle.akka.version}"
testImplementation "com.typesafe.akka:akka-http-testkit_${gradle.scala.depVersion}:${gradle.akka_http.version}"
}

mainClassName = "org.apache.openwhisk.core.monitoring.metrics.Main"
Expand Down
12 changes: 5 additions & 7 deletions core/scheduler/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ ext.coverageDirs = [
"${buildDir}/classes/scala/scoverage",
"${project(':common:scala').buildDir.absolutePath}/classes/scala/scoverage"
]
distDockerCoverage.dependsOn ':common:scala:scoverageClasses', 'scoverageClasses'

buildscript {
repositories {
Expand All @@ -44,7 +43,7 @@ buildscript {
dependencies {
// see https://plugins.gradle.org/plugin/com.lightbend.akka.grpc.gradle
// for the currently latest version.
classpath 'gradle.plugin.com.lightbend.akka.grpc:akka-grpc-gradle-plugin:0.7.2'
classpath 'com.lightbend.akka.grpc:akka-grpc-gradle-plugin:1.0.0'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this handle the annoying akka-grpc plugin logs issue?

Copy link
Member Author

@upgle upgle Jul 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, this is for resolving compatibility issue with gradle 6.
This PR is for gradle version upgrade only and does not consider any other issues.

The problem you mentioned seems to be fixed in the akka-grpc 2.1.0 version.
I tried to upgrade the version, but the build does not work due to a dependency problem.

It would be better to deal with other PR.

https://github.com/akka/akka-grpc/releases/tag/v2.1.0
akka/akka-grpc#1363

}
}

Expand All @@ -55,18 +54,17 @@ configurations {

dependencies {
configurations.all {
resolutionStrategy.force "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.1.3"
resolutionStrategy.force "com.lihaoyi:fastparse_${gradle.scala.depVersion}:2.3.0"
resolutionStrategy.force "com.typesafe.akka:akka-http-core_${gradle.scala.depVersion}:${gradle.akka_http.version}"
resolutionStrategy.force "com.typesafe.akka:akka-http_${gradle.scala.depVersion}:${gradle.akka_http.version}"
resolutionStrategy.force "com.typesafe.akka:akka-http2-support_${gradle.scala.depVersion}:${gradle.akka_http.version}"
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}"
}

compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile "io.altoo:akka-kryo-serialization_${gradle.scala.depVersion}:1.0.0"
compile project(':common:scala')
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation project(':common:scala')
implementation "io.altoo:akka-kryo-serialization_${gradle.scala.depVersion}:1.0.0"
}

// workaround for akka-grpc
Expand Down
24 changes: 13 additions & 11 deletions core/standalone/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,17 +157,19 @@ gitProperties {
install.dependsOn(bootJar)

dependencies {
compile "org.scala-lang:scala-library:${gradle.scala.version}"
compile project(':core:controller')
compile project(':tools:admin')
compile "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"

compile "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0"
compile "org.scala-lang:scala-reflect:${gradle.scala.version}"
compile "ch.megard:akka-http-cors_${gradle.scala.depVersion}:0.4.2"

testCompile "junit:junit:4.11"
testCompile "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
implementation "org.scala-lang:scala-library:${gradle.scala.version}"
implementation project(':common:scala')
implementation project(':core:controller')
implementation project(':core:invoker')
implementation project(':tools:admin')
implementation "org.rogach:scallop_${gradle.scala.depVersion}:3.3.2"

implementation "io.github.embeddedkafka:embedded-kafka_${gradle.scala.depVersion}:2.4.0"
implementation "org.scala-lang:scala-reflect:${gradle.scala.version}"
implementation "ch.megard:akka-http-cors_${gradle.scala.depVersion}:0.4.2"

testImplementation "junit:junit:4.11"
testImplementation "org.scalatest:scalatest_${gradle.scala.depVersion}:3.0.8"
}

gradle.projectsEvaluated {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@

distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading