Skip to content

Commit

Permalink
Consistently use GE plugin 3.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfs committed Apr 8, 2020
1 parent b1abd8e commit 8a0064f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
6 changes: 1 addition & 5 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* limitations under the License.
*/

import java.util.*
import org.gradle.internal.os.OperatingSystem
import java.util.Properties

plugins {
`java`
Expand Down Expand Up @@ -88,10 +88,6 @@ allprojects {
excludeModule("com.google.j2objc", "j2objc-annotations")
}
}
maven {
name = "Gradle Enterprise Gradle plugin RC"
url = uri("https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local")
}
maven {
name = "kotlinx"
url = uri("https://dl.bintray.com/kotlin/kotlinx")
Expand Down
12 changes: 1 addition & 11 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,11 @@ pluginManagement {
repositories {
gradlePluginPortal()
maven { url = uri("https://repo.gradle.org/gradle/libs-releases") }
maven { url = uri("https://repo.gradle.org/gradle/enterprise-libs-release-candidates-local") }
}

// No plugin marker for plugin RC - can be removed when going to a final version
resolutionStrategy {
eachPlugin {
if (requested.id.id == "com.gradle.enterprise") {
useModule("com.gradle:gradle-enterprise-gradle-plugin:${requested.version}")
}
}
}
}

plugins {
id("com.gradle.enterprise").version("3.2-rc-1")
id("com.gradle.enterprise").version("3.2.1")
}

apply(from = "gradle/build-cache-configuration.settings.gradle.kts")
Expand Down

0 comments on commit 8a0064f

Please sign in to comment.