From 9bc84405982fe47eb5837e9d5835a30dbfa563df Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Fri, 5 Apr 2024 10:58:57 +0200 Subject: [PATCH 1/2] Use 1.0 versions of sbt develocity plugin and ccud --- common-develocity-sbt-configuration/build.sbt | 5 ++--- common-develocity-sbt-configuration/project/build.properties | 1 + .../{ => project}/plugins.sbt | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 common-develocity-sbt-configuration/project/build.properties rename common-develocity-sbt-configuration/{ => project}/plugins.sbt (56%) diff --git a/common-develocity-sbt-configuration/build.sbt b/common-develocity-sbt-configuration/build.sbt index b4161a98f..e9d21196b 100644 --- a/common-develocity-sbt-configuration/build.sbt +++ b/common-develocity-sbt-configuration/build.sbt @@ -1,13 +1,12 @@ // You can configure the Develocity sbt plugin to publish Build Scans to your Develocity server // by adding the following configuration to your project's build.sbt file -Global / gradleEnterpriseConfiguration := - GradleEnterpriseConfiguration( +Global / develocityConfiguration := + DevelocityConfiguration( server = Server( url = Some(url("https://develocity-samples.gradle.com")), // adjust to your Develocity server allowUntrusted = false), // ensure a trusted certificate is configured buildScan = BuildScan( - publishConfig = PublishConfig.Always, backgroundUpload = !sys.env.get("CI").exists(_.toBoolean))) lazy val `common-develocity-sbt-configuration` = (project in file(".")) // adjust to your project name diff --git a/common-develocity-sbt-configuration/project/build.properties b/common-develocity-sbt-configuration/project/build.properties new file mode 100644 index 000000000..04267b14a --- /dev/null +++ b/common-develocity-sbt-configuration/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.9 diff --git a/common-develocity-sbt-configuration/plugins.sbt b/common-develocity-sbt-configuration/project/plugins.sbt similarity index 56% rename from common-develocity-sbt-configuration/plugins.sbt rename to common-develocity-sbt-configuration/project/plugins.sbt index 6fb95cc2d..cd0c77877 100644 --- a/common-develocity-sbt-configuration/plugins.sbt +++ b/common-develocity-sbt-configuration/project/plugins.sbt @@ -1,4 +1,5 @@ // You apply the Develocity sbt plugin to your build by adding the following // configuration block to a new or existing project/plugins.sbt file in your sbt project -addSbtPlugin("com.gradle" % "sbt-gradle-enterprise" % "0.10.1") +addSbtPlugin("com.gradle" % "sbt-develocity" % "1.0") +addSbtPlugin("com.gradle" % "sbt-develocity-common-custom-user-data" % "1.0") \ No newline at end of file From 45111f6524d0ac96227f9f1c27eaf5e1eba6c9a0 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Fri, 5 Apr 2024 11:36:41 +0200 Subject: [PATCH 2/2] Update common-develocity-sbt-configuration/build.sbt Co-authored-by: Martin Duhem Signed-off-by: Nelson Osacky --- common-develocity-sbt-configuration/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-develocity-sbt-configuration/build.sbt b/common-develocity-sbt-configuration/build.sbt index e9d21196b..57199fc85 100644 --- a/common-develocity-sbt-configuration/build.sbt +++ b/common-develocity-sbt-configuration/build.sbt @@ -1,7 +1,7 @@ // You can configure the Develocity sbt plugin to publish Build Scans to your Develocity server // by adding the following configuration to your project's build.sbt file -Global / develocityConfiguration := +ThisBuild / develocityConfiguration := DevelocityConfiguration( server = Server( url = Some(url("https://develocity-samples.gradle.com")), // adjust to your Develocity server