Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sudo: false
dist: trusty
dist: focal
language: java

before_cache:
Expand All @@ -11,7 +11,7 @@ cache:
- $HOME/.gradle/wrapper/

jdk:
- oraclejdk8
- oraclejdk17

script:
- ./gradlew check --info -S --parallel
- ./gradlew check --info -S --parallel
45 changes: 30 additions & 15 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
import com.amazonaws.auth.STSAssumeRoleSessionCredentialsProvider
import com.amazonaws.auth.*
import com.amazonaws.auth.profile.ProfileCredentialsProvider
import com.amazonaws.services.s3.AmazonS3Client
import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClient

apply plugin: 'java-library'
apply plugin: 'maven-publish'

group = 'com.mojang'
version = project.hasProperty('buildNumber') ? "${project.majorMinor}.${project.buildNumber}" : "${project.majorMinor}.0-SNAPSHOT"

task wrapper(type: Wrapper) {
gradleVersion = '4.0'
}
sourceCompatibility = 17
targetCompatibility = 17

buildscript {
repositories {
Expand All @@ -20,7 +21,7 @@ buildscript {
}

dependencies {
classpath 'com.amazonaws:aws-java-sdk:1.11.33'
classpath 'com.amazonaws:aws-java-sdk:1.12.172'
}
}

Expand All @@ -32,14 +33,16 @@ repositories {
}

dependencies {
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
compile 'com.google.code.gson:gson:2.8.9'
compile 'org.slf4j:slf4j-api:1.8.0-beta4'
compile 'com.google.guava:guava:31.0.1-jre'
compile 'org.apache.commons:commons-lang3:3.12.0'
compile 'it.unimi.dsi:fastutil:8.5.6'
testCompile 'junit:junit-dep:4.10'
testCompile "org.slf4j:slf4j-simple:1.8.0-beta4"
api 'com.google.code.gson:gson:2.8.9' // JsonElement and the rest used and exposed in JsonOps
api 'com.google.guava:guava:31.0.1-jre' // TypeToken primarily exposed
api 'it.unimi.dsi:fastutil:8.5.6' // various collection types are used in public API

compileOnlyApi 'com.google.code.findbugs:jsr305:3.0.2'
implementation 'org.slf4j:slf4j-api:1.8.0-beta4'
implementation 'org.apache.commons:commons-lang3:3.12.0'

testImplementation 'junit:junit-dep:4.10'
testImplementation "org.slf4j:slf4j-simple:1.8.0-beta4"
}

task sourcesJar(type: Jar) {
Expand Down Expand Up @@ -113,14 +116,26 @@ if (version.endsWith("SNAPSHOT")) {
} else {
publishing.repositories {
maven {
url "$buildDir/repo"
url "$buildDir/repo"
}
}

publish.doLast {
def AWSRoleARN = (System.getenv("AWS_ROLE_ARN") != null && System.getenv("AWS_ROLE_ARN") != "" ? System.getenv("AWS_ROLE_ARN") : null)
if (AWSRoleARN == null) throw new GradleException("AWS Role has not been configured, use the `AWS_ROLE_ARN` environment variable")
def auth = new STSAssumeRoleSessionCredentialsProvider.Builder(AWSRoleARN, "DataFixerUpperPublish").build()
def providerChain = new AWSCredentialsProviderChain(
new EnvironmentVariableCredentialsProvider(),
new SystemPropertiesCredentialsProvider(),
// Default provider below gets in an infinite loop if AWS_ROLE_ARN is provided
//WebIdentityTokenCredentialsProvider.create(),
new ProfileCredentialsProvider(),
new EC2ContainerCredentialsProviderWrapper()
)

def auth = new STSAssumeRoleSessionCredentialsProvider.Builder(AWSRoleARN, "DataFixerUpperPublish")
.withStsClient(AWSSecurityTokenServiceClient.builder().withCredentials(providerChain).build())
.build()

def s3 = new AmazonS3Client(auth)
publishDir.eachFileRecurse {
if (!it.name.contains(".xml") && !it.name.contains(".md5") && it.isFile()) {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
majorMinor: 4.1
majorMinor: 5.0
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed Jun 21 14:07:34 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
53 changes: 33 additions & 20 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

173 changes: 89 additions & 84 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading