diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index fe9937c..a6b046e 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -12,8 +12,10 @@ pluginManagement { repositories { gradlePluginPortal() - // OpenSavvy conventions - maven("https://gitlab.com/api/v4/projects/51233470/packages/maven") + maven { + name = "opensavvy-gradle-conventions" + url = uri("https://gitlab.com/api/v4/projects/51233470/packages/maven") + } } } diff --git a/settings.gradle.kts b/settings.gradle.kts index af9e95f..9dd99bc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,8 +14,10 @@ pluginManagement { gradlePluginPortal() google() - // OpenSavvy conventions - maven("https://gitlab.com/api/v4/projects/51233470/packages/maven") + maven { + name = "opensavvy-gradle-conventions" + url = uri("https://gitlab.com/api/v4/projects/51233470/packages/maven") + } } includeBuild("gradle/conventions") -- 2.51.2 From a2f64bcfcf3c07d23b0ee96c1e104b30c1d18eef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sat, 9 Mar 2024 17:34:28 +0100 Subject: [PATCH 2/6] build(gradle): Faster dependency downloads by specifying where to find the OpenSavvy Gradle Conventions --- gradle/conventions/settings.gradle.kts | 19 ++++++++++++++++++- settings.gradle.kts | 20 ++++++++++++++++++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index a6b046e..5ed8f90 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -10,12 +10,29 @@ dependencyResolutionManagement { pluginManagement { repositories { - gradlePluginPortal() + // region OpenSavvy Conventions maven { name = "opensavvy-gradle-conventions" url = uri("https://gitlab.com/api/v4/projects/51233470/packages/maven") + + metadataSources { + gradleMetadata() + mavenPom() + } + + content { + includeGroupAndSubgroups("dev.opensavvy") + } } + + // endregion + // region Standard repositories + + gradlePluginPortal() + google() + + // endregion } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 9dd99bc..678ae93 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -11,13 +11,29 @@ rootProject.name = "Playground" pluginManagement { repositories { - gradlePluginPortal() - google() + // region OpenSavvy Conventions maven { name = "opensavvy-gradle-conventions" url = uri("https://gitlab.com/api/v4/projects/51233470/packages/maven") + + metadataSources { + gradleMetadata() + mavenPom() + } + + content { + includeGroupAndSubgroups("dev.opensavvy") + } } + + // endregion + // region Standard repositories + + gradlePluginPortal() + google() + + // endregion } includeBuild("gradle/conventions") -- 2.51.2 From 5a546fb0fddf6f5b44f1f21e0badc7ca630e9d96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sat, 9 Mar 2024 17:36:02 +0100 Subject: [PATCH 3/6] build(gradle): Declare dependency repositories globally --- gradle/conventions/settings.gradle.kts | 5 +++++ settings.gradle.kts | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index 5ed8f90..ef2ac74 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -1,6 +1,11 @@ rootProject.name = "conventions" dependencyResolutionManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } + versionCatalogs { create("libs") { from(files("../libs.versions.toml")) diff --git a/settings.gradle.kts b/settings.gradle.kts index 678ae93..d0bb197 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,6 +9,12 @@ rootProject.name = "Playground" +dependencyResolutionManagement { + repositories { + mavenCentral() + } +} + pluginManagement { repositories { // region OpenSavvy Conventions -- 2.51.2 From c375c3a08c8571c952eeb56e62f2eb9e13883ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sat, 9 Mar 2024 17:36:32 +0100 Subject: [PATCH 4/6] build(gradle): Allow downloading plugins from MavenCentral --- gradle/conventions/settings.gradle.kts | 1 + settings.gradle.kts | 1 + 2 files changed, 2 insertions(+) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index ef2ac74..904396c 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -36,6 +36,7 @@ pluginManagement { gradlePluginPortal() google() + mavenCentral() // endregion } diff --git a/settings.gradle.kts b/settings.gradle.kts index d0bb197..5af46cc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -38,6 +38,7 @@ pluginManagement { gradlePluginPortal() google() + mavenCentral() // endregion } -- 2.51.2 From c15e817f5ef573a518c1b93cc54d62950f6b9f53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Sat, 2 Mar 2024 16:19:09 +0100 Subject: [PATCH 5/6] upgrade(gradle): OpenSavvy Gradle Conventions 1.1.1 --- gradle/conventions/settings.gradle.kts | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index 904396c..3f4ad01 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -43,7 +43,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.1.0" + id("dev.opensavvy.conventions.settings") version "1.1.1" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") diff --git a/settings.gradle.kts b/settings.gradle.kts index 5af46cc..d3e877b 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,7 +47,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.1.0" + id("dev.opensavvy.conventions.settings") version "1.1.1" } include( -- 2.51.2 From a1add60ef988a35820d373a6017f1e3278098e0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivan=20=E2=80=9CCLOVIS=E2=80=9D=20Canet?= Date: Mon, 11 Mar 2024 22:30:22 +0100 Subject: [PATCH 6/6] upgrade: OpenSavvy Gradle Conventions 1.1.2 Changelog: https://gitlab.com/opensavvy/automation/gradle-conventions/-/releases/1.1.2 --- gradle/conventions/settings.gradle.kts | 2 +- settings.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/conventions/settings.gradle.kts b/gradle/conventions/settings.gradle.kts index 3f4ad01..ba94ef2 100644 --- a/gradle/conventions/settings.gradle.kts +++ b/gradle/conventions/settings.gradle.kts @@ -43,7 +43,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.1.1" + id("dev.opensavvy.conventions.settings") version "1.1.2" } enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") diff --git a/settings.gradle.kts b/settings.gradle.kts index d3e877b..ba79ee2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -47,7 +47,7 @@ pluginManagement { } plugins { - id("dev.opensavvy.conventions.settings") version "1.1.1" + id("dev.opensavvy.conventions.settings") version "1.1.2" } include(