use published buf artifacts (#99)

src/main/kotlin/com/parmet/buf/gradle/BufExtension.kt

@@ -50,7 +50,12 @@ open class BufExtension {
     /**
      * Specify the version of Buf.
      */
-    var toolVersion: String = "1.8.0"
+    var toolVersion = "1.8.0"
+
+    /**
+     * Specify the version of the Buf executable artifact.
+     */
+    var toolArtifactVersion = "1.0.0"
 
     internal var imageArtifactDetails: ArtifactDetails? = null
 

src/main/kotlin/com/parmet/buf/gradle/BufSupport.kt

@@ -17,28 +17,17 @@ package com.parmet.buf.gradle
 
 import org.gradle.api.Project
 import org.gradle.api.Task
-import org.gradle.kotlin.dsl.ivy
-import org.gradle.kotlin.dsl.repositories
 import java.nio.charset.StandardCharsets
 
 const val BUF_BINARY_CONFIGURATION_NAME = "bufTool"
 
 internal fun Project.configureBufDependency() {
-    repositories {
-        ivy("https://github.com") {
-            patternLayout {
-                artifact("/[organization]/[module]/releases/download/v[revision]/buf-[classifier]-[ext]")
-            }
-            metadataSources { artifact() }
-        }
-    }
-
     val os = System.getProperty("os.name").toLowerCase()
-    val (osPart, archExt) =
+    val osPart =
         when {
-            os.startsWith("windows") -> "Windows" to ".exe"
-            os.startsWith("linux") -> "Linux" to ""
-            os.startsWith("mac") -> "Darwin" to ""
+            os.startsWith("windows") -> "windows"
+            os.startsWith("linux") -> "linux"
+            os.startsWith("mac") -> "osx"
             else -> error("unsupported os: $os")
         }
 
@@ -49,9 +38,17 @@ internal fun Project.configureBufDependency() {
             else -> error("unsupported arch: $arch")
         }
 
+    val extension = getExtension()
+
     createConfigurationWithDependency(
         BUF_BINARY_CONFIGURATION_NAME,
-        "bufbuild:buf:${getExtension().toolVersion}:$osPart@${archPart + archExt}"
+        mapOf(
+            "group" to "com.parmet.buf",
+            "name" to "buf",
+            "version" to extension.toolArtifactVersion,
+            "classifier" to "${extension.toolVersion}-$osPart-$archPart",
+            "ext" to "exe"
+        )
     )
 }
 

src/test/resources/BreakingTest/breaking schema fails with latest-release and previousVersion/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingTest/breaking schema with latest-release as version/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingTest/breaking schema/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingTest/normally breaking schema with an ignore/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingWithWorkspaceTest/breaking schema fails with latest-release and previousVersion/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingWithWorkspaceTest/breaking schema with latest-release as version/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingWithWorkspaceTest/breaking schema/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BreakingWithWorkspaceTest/normally breaking schema with an ignore/build.gradle

@@ -20,6 +20,7 @@ plugins {
 }
 
 repositories {
+  mavenCentral()
   maven { url 'build/repos/test' }
 }
 

src/test/resources/BuildTest/build image with explicit artifact details/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
   imageArtifact {

src/test/resources/BuildTest/build image with inferred artifact details/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
 }

src/test/resources/BuildTest/build image with no artifact details should fail/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
 }

src/test/resources/BuildTest/build image with two publications should fail/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
 }

src/test/resources/BuildTest/build image with two publications should succeed if details are provided explicitly/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
   imageArtifact {

src/test/resources/BuildWithProtobufGradleTest/build image with explicit artifact details/build.gradle

@@ -20,7 +20,9 @@ plugins {
   id 'maven-publish'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/BuildWithProtobufGradleTest/build image with inferred artifact details/build.gradle

@@ -20,7 +20,9 @@ plugins {
   id 'maven-publish'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/BuildWithProtobufGradleTest/build image with no artifact details should fail/build.gradle

@@ -20,7 +20,9 @@ plugins {
   id 'maven-publish'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/BuildWithProtobufGradleTest/build image with two publications should fail/build.gradle

@@ -20,7 +20,9 @@ plugins {
   id 'maven-publish'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/BuildWithProtobufGradleTest/build image with two publications should succeed if details are provided explicitly/build.gradle

@@ -20,7 +20,9 @@ plugins {
   id 'maven-publish'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/BuildWithWorkspaceTest/build image with explicit artifact details/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
   imageArtifact {

src/test/resources/BuildWithWorkspaceTest/build image with inferred artifact details/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
 }

src/test/resources/BuildWithWorkspaceTest/build image with no artifact details should fail/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
 }

src/test/resources/BuildWithWorkspaceTest/build image with two publications should fail/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
 }

src/test/resources/BuildWithWorkspaceTest/build image with two publications should succeed if details are provided explicitly/build.gradle

@@ -19,6 +19,10 @@ plugins {
   id 'maven-publish'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   publishSchema = true
   imageArtifact {

src/test/resources/ConfigurationTest/project cannot use both workspaces and the protobuf-gradle-plugin, protobuf applied first/build.gradle

@@ -18,3 +18,7 @@ plugins {
   id 'com.google.protobuf' version "$protobufGradleVersion"
   id 'com.parmet.buf'
 }
+
+repositories {
+  mavenCentral()
+}

src/test/resources/ConfigurationTest/project cannot use both workspaces and the protobuf-gradle-plugin, protobuf applied second/build.gradle

@@ -18,3 +18,7 @@ plugins {
   id 'com.parmet.buf'
   id 'com.google.protobuf' version "$protobufGradleVersion"
 }
+
+repositories {
+  mavenCentral()
+}

src/test/resources/FormatApplyTest/format an incorrect message/build.gradle

@@ -17,3 +17,7 @@ plugins {
   id 'java'
   id 'com.parmet.buf'
 }
+
+repositories {
+  mavenCentral()
+}

src/test/resources/FormatApplyWithProtobufGradleTest/format a bad file with a protobuf dependency and a google dependency with the protobuf-gradle-plugin/build.gradle

@@ -19,7 +19,9 @@ plugins {
   id 'com.parmet.buf'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/FormatApplyWithProtobufGradleTest/format a bad separate protobuf source directory through the protobuf-gradle-plugin/build.gradle

@@ -19,7 +19,9 @@ plugins {
   id 'com.parmet.buf'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/FormatApplyWithProtobufGradleTest/format an incorrect message/build.gradle

@@ -19,7 +19,9 @@ plugins {
   id 'com.parmet.buf'
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {

src/test/resources/FormatApplyWithWorkspaceTest/format an incorrect message/build.gradle

@@ -17,3 +17,7 @@ plugins {
   id 'java'
   id 'com.parmet.buf'
 }
+
+repositories {
+  mavenCentral()
+}

src/test/resources/FormatCheckTest/do not format an incorrect message when enforcement is disabled/build.gradle

@@ -18,6 +18,10 @@ plugins {
   id 'com.parmet.buf'
 }
 
+repositories {
+  mavenCentral()
+}
+
 buf {
   enforceFormat = true
 }

src/test/resources/FormatCheckTest/format a correct message/build.gradle

@@ -17,3 +17,7 @@ plugins {
   id 'java'
   id 'com.parmet.buf'
 }
+
+repositories {
+  mavenCentral()
+}

src/test/resources/FormatCheckTest/format an incorrect message/build.gradle

@@ -17,3 +17,7 @@ plugins {
   id 'java'
   id 'com.parmet.buf'
 }
+
+repositories {
+  mavenCentral()
+}

src/test/resources/FormatCheckWithProtobufGradleTest/do not format an incorrect message when enforcement is disabled/build.gradle

@@ -23,7 +23,9 @@ buf {
   enforceFormat = true
 }
 
-repositories { mavenCentral() }
+repositories {
+  mavenCentral()
+}
 
 protobuf {
   protoc {