use GCS repo

GradleUp · Nov 3, 2024 · 6a2d6d5 · 6a2d6d5
1 parent 2707254
commit 6a2d6d5
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,8 @@
-import com.gradleup.librarian.gradle.librarianRoot
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("org.jetbrains.kotlin.jvm").version("2.0.0").apply(false)
-  id("com.gradleup.librarian").version("0.0.7-SNAPSHOT").apply(false)
+  id("com.gradleup.librarian").version("0.0.7-SNAPSHOT-2707254bba17a35aa7ad75ca9c151f36256f07c0").apply(false)
 }
 
-librarianRoot()
+Librarian.root(project)
diff --git a/librarian-cli/build.gradle.kts b/librarian-cli/build.gradle.kts
@@ -1,12 +1,12 @@
-import com.gradleup.librarian.gradle.librarianModule
+import com.gradleup.librarian.gradle.Librarian
 
 plugins {
   id("java")
   id("org.jetbrains.kotlin.jvm")
   id("distribution")
 }
 
-librarianModule()
+Librarian.module(project)
 
 dependencies {
   implementation(project(":librarian-core"))

diff --git a/librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/Librarian.kt b/librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/Librarian.kt
@@ -4,10 +4,12 @@ import org.gradle.api.Project
 
 class Librarian {
   companion object {
+    @Suppress("DEPRECATION")
     fun root(project: Project) {
       project.librarianRoot()
     }
 
+    @Suppress("DEPRECATION")
     fun module(project: Project) {
       project.librarianModule()
     }

diff --git a/librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/module.kt b/librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/module.kt
@@ -69,7 +69,7 @@ internal fun Project.moduleProperties(): Properties {
   }
 }
 
-@Deprecated("use Librarian.module() instead.", ReplaceWith("Librarian.module()"))
+@Deprecated("use Librarian.module() instead.", ReplaceWith("Librarian.module(project)", "import com.gradleup.librarian.gradle.Librarian"))
 fun Project.librarianModule() {
   val rootProperties = rootProperties()
   val moduleProperties = moduleProperties()

diff --git a/librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/root.kt b/librarian-gradle-plugin/src/main/kotlin/com/gradleup/librarian/gradle/root.kt
@@ -21,7 +21,7 @@ internal val librarianPublishToGcs = "librarianPublishToGcs"
 
 internal val skipProjectIsolationIncompatibleParts = false
 
-@Deprecated("use Librarian.root() instead", ReplaceWith("Librarian.root()"))
+@Deprecated("use Librarian.root() instead", ReplaceWith("Librarian.module(project)", "import com.gradleup.librarian.gradle.Librarian"))
 fun Project.librarianRoot() {
   if (!skipProjectIsolationIncompatibleParts) {
     configureBcv()

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,10 +1,16 @@
 pluginManagement {
   listOf(repositories, dependencyResolutionManagement.repositories).forEach {
     it.apply {
-      mavenLocal()
       mavenCentral()
       google()
 
+      exclusiveContent {
+        forRepository { maven("https://storage.googleapis.com/gradleup/m2") }
+        filter {
+          includeGroup("com.gradleup.librarian")
+        }
+      }
+
       exclusiveContent {
         forRepository { maven("https://jitpack.io") }
         filter {