logistics: Replace usage of jcenter (shutting down) (#4632)

develop
Rasmus Praestholm 2021-04-21 20:00:27 -05:00 committed by GitHub
parent d7f7549028
commit ad6aa9b49d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 5 additions and 14 deletions

View File

@ -8,7 +8,7 @@ plugins {
}
repositories {
jcenter()
mavenCentral()
maven {
name = "Terasology Artifactory"

View File

@ -5,13 +5,11 @@ import java.net.URI
// We use both Maven Central and our own Artifactory instance, which contains module builds, extra libs, and so on
repositories {
// External libs - jcenter is Bintray and a superset of Maven Central
jcenter {
mavenCentral {
content {
// This is first choice for most java dependencies, but assume we'll need to check our
// own repository for things from our own organization.
// (This is an optimization so gradle doesn't try to find our hundreds of modules
// in jcenter.)
// (This is an optimization so gradle doesn't try to find our hundreds of modules in 3rd party repos)
excludeGroupByRegex("""org\.terasology(\..+)?""")
}
}

View File

@ -4,8 +4,6 @@
// Dependencies needed for what our Gradle scripts themselves use. It cannot be included via an external Gradle file :-(
buildscript {
repositories {
// External libs - jcenter is Bintray and is supposed to be a superset of Maven Central, but do both just in case
jcenter()
mavenCentral()
gradlePluginPortal()
@ -75,8 +73,6 @@ ext {
// Declare remote repositories we're interested in - library files will be fetched from here
repositories {
// External libs - jcenter is Bintray and is supposed to be a superset of Maven Central, but do both just in case
jcenter()
mavenCentral()
// MovingBlocks Artifactory instance for libs not readily available elsewhere plus our own libs

View File

@ -3,7 +3,8 @@ import groovy.json.JsonSlurper
@Grab(group = 'org.slf4j', module = 'slf4j-api', version = '1.6.1')
@Grab(group = 'org.slf4j', module = 'slf4j-nop', version = '1.6.1')
@GrabResolver(name = 'jcenter', root = 'http://jcenter.bintray.com/')
// TODO: Temp replacement for jcenter, grgit is not in MavenCentral yet
@GrabResolver(name = 'ajoberstar-backup', root = 'https://ajoberstar.github.io/bintray-backup/')
@Grab(group = 'org.ajoberstar', module = 'grgit', version = '1.9.3')
import org.ajoberstar.grgit.Grgit
import org.ajoberstar.grgit.exception.GrgitException

View File

@ -4,8 +4,6 @@
// Alternatively we untangle and update the common.gradle / Kotlin Gradle plugin stuff or just remove these two
buildscript {
repositories {
// External libs - jcenter is Bintray and is supposed to be a superset of Maven Central, but do both just in case
jcenter()
mavenCentral()
maven {
url = uri("https://plugins.gradle.org/m2/")

View File

@ -6,8 +6,6 @@ apply plugin: 'pmd'
// Same repository configuration as root project
repositories {
// External libs - jcenter is Bintray and is supposed to be a superset of Maven Central, but do both just in case
jcenter()
mavenCentral()
// MovingBlocks Artifactory instance for libs not readily available elsewhere plus our own libs