Merge pull request #8 from bitrise-io/gradle-analytics-upgrade-to-v2.0-RC1

Gradle Analytics Plugin upgrade to version 2.0-RC1

Author: viktorbenei

internal/config/gradle/gradleconfig.go

@@ -8,6 +8,7 @@ import (
 	"text/template"
 
 	"github.com/bitrise-io/bitrise-build-cache-cli/internal/config/common"
+	"github.com/bitrise-io/bitrise-build-cache-cli/internal/consts"
 )
 
 //go:embed initd.gradle.kts.gotemplate
@@ -21,30 +22,18 @@ var (
 type templateInventory struct {
 	AuthToken                string
 	CacheEndpointURLWithPort string
-	CacheVersion             string
+	CachePluginVersion       string
 	PushEnabled              bool
 	DebugEnabled             bool
 	ValidationLevel          string
-	MetricsEnabled           bool
-	MetricsVersion           string
-	MetricsEndpoint          string
-	MetricsPort              int
+	AnalyticsEnabled         bool
+	AnalyticsPluginVersion   string
+	AnalyticsEndpoint        string
+	AnalyticsPort            int
 	// Metadata
 	CacheConfigMetadata common.CacheConfigMetadata
 }
 
-// Sync the major version of this step and the library.
-// Use the latest 1.x version of our dependency, so we don't have to update this definition after every lib release.
-// But don't forget to update this to `2.+` if the library reaches version 2.0!
-const gradleRemoteBuildCachePluginDepVersion = "1.+"
-
-// Sync the major version of this step and the plugin.
-// Use the latest 1.x version of the plugin, so we don't have to update this definition after every plugin release.
-// But don't forget to update this to `2.+` if the library reaches version 2.0!
-const analyticsPluginDepVersion = "0.+"
-const analyticsEndpoint = "gradle-analytics.services.bitrise.io"
-const analyticsPort = 443
-
 // Generate init.gradle content.
 // Recommended to save the content into $HOME/.gradle/init.d/ instead of
 // overwriting the $HOME/.gradle/init.gradle file.
@@ -62,14 +51,14 @@ func GenerateInitGradle(endpointURL, authToken string, analyticsEnabled bool, ca
 	inventory := templateInventory{
 		AuthToken:                authToken,
 		CacheEndpointURLWithPort: endpointURL,
-		CacheVersion:             gradleRemoteBuildCachePluginDepVersion,
+		CachePluginVersion:       consts.GradleRemoteBuildCachePluginDepVersion,
 		PushEnabled:              true,
 		DebugEnabled:             true,
 		ValidationLevel:          "warning",
-		MetricsEnabled:           analyticsEnabled,
-		MetricsVersion:           analyticsPluginDepVersion,
-		MetricsEndpoint:          analyticsEndpoint,
-		MetricsPort:              analyticsPort,
+		AnalyticsEnabled:         analyticsEnabled,
+		AnalyticsPluginVersion:   consts.GradleAnalyticsPluginDepVersion,
+		AnalyticsEndpoint:        consts.GradleAnalyticsEndpoint,
+		AnalyticsPort:            consts.GradleAnalyticsPort,
 		CacheConfigMetadata:      cacheConfigMetadata,
 	}
 

internal/config/gradle/gradleconfig_test.go

@@ -108,11 +108,10 @@ initscript {
         mavenCentral()
         google()
         maven(url="https://jitpack.io")
-        maven(url="https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
     dependencies {
         classpath("io.bitrise.gradle:remote-cache:1.+")
-        classpath("io.bitrise.gradle:gradle-analytics:main-SNAPSHOT")
+        classpath("io.bitrise.gradle:gradle-analytics:2.0-RC1")
     }
 }
 
@@ -163,11 +162,10 @@ initscript {
         mavenCentral()
         google()
         maven(url="https://jitpack.io")
-        maven(url="https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
     dependencies {
         classpath("io.bitrise.gradle:remote-cache:1.+")
-        classpath("io.bitrise.gradle:gradle-analytics:main-SNAPSHOT")
+        classpath("io.bitrise.gradle:gradle-analytics:2.0-RC1")
     }
 }
 
@@ -215,7 +213,6 @@ initscript {
         mavenCentral()
         google()
         maven(url="https://jitpack.io")
-        maven(url="https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
     dependencies {
         classpath("io.bitrise.gradle:remote-cache:1.+")

internal/config/gradle/initd.gradle.kts.gotemplate

@@ -7,12 +7,11 @@ initscript {
         mavenCentral()
         google()
         maven(url="https://jitpack.io")
-        maven(url="https://s01.oss.sonatype.org/content/repositories/snapshots/")
     }
     dependencies {
-        classpath("io.bitrise.gradle:remote-cache:1.+")
-        {{- if .MetricsEnabled }}
-        classpath("io.bitrise.gradle:gradle-analytics:main-SNAPSHOT")
+        classpath("io.bitrise.gradle:remote-cache:{{ .CachePluginVersion }}")
+        {{- if .AnalyticsEnabled }}
+        classpath("io.bitrise.gradle:gradle-analytics:{{ .AnalyticsPluginVersion }}")
         {{- end }}
     }
 }
@@ -34,13 +33,13 @@ settingsEvaluated {
     }
 }
 
-{{- if .MetricsEnabled }}
+{{- if .AnalyticsEnabled }}
 
 rootProject {
     apply<io.bitrise.gradle.analytics.AnalyticsPlugin>()
 
     extensions.configure<io.bitrise.gradle.analytics.AnalyticsPluginExtension>{
-        endpoint.set("{{ .MetricsEndpoint }}:{{ .MetricsPort }}")
+        endpoint.set("{{ .AnalyticsEndpoint }}:{{ .AnalyticsPort }}")
         authToken.set("{{ .AuthToken }}")
         dumpEventsToFiles.set({{ .DebugEnabled }})
         debug.set({{ .DebugEnabled }})

internal/consts/consts.go

@@ -4,4 +4,14 @@ const (
 	EndpointURLDefault = "grpcs://remote-build-cache.services.bitrise.io"
 	EndpointURLLAS1    = "grpc://las-cache.services.bitrise.io:6666"
 	EndpointURLATL1    = "grpc://atl-cache.services.bitrise.io:6666"
+
+	// Gradle Remote Build Cache related consts
+	// Use the latest 1.x version of our dependency, so we don't have to update this definition after every lib release.
+	// But don't forget to update this to `2.+` if the library reaches version 2.0!
+	GradleRemoteBuildCachePluginDepVersion = "1.+"
+
+	// Gradle Analytics related consts
+	GradleAnalyticsPluginDepVersion = "2.0-RC1"
+	GradleAnalyticsEndpoint         = "gradle-analytics.services.bitrise.io"
+	GradleAnalyticsPort             = 443
 )