Further attempts

This commit is contained in:
Matthew Miller 2018-12-15 18:57:37 +10:00
parent e6d5ce8165
commit 11cf5377d9
2 changed files with 5 additions and 13 deletions

View File

@ -7,20 +7,19 @@ buildscript {
configurations.all { configurations.all {
resolutionStrategy { resolutionStrategy {
force 'com.google.guava:guava:21.0' force 'commons-io:commons-io:2.4'
force 'org.ow2.asm:asm:6.0_BETA'
} }
} }
dependencies { dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4' classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5' classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1'
classpath 'org.ajoberstar:gradle-git:1.7.2'
} }
} }
plugins { plugins {
id 'net.minecrell.licenser' version '0.4.1' apply false id 'net.minecrell.licenser' version '0.4.1' apply false
id "org.ajoberstar.grgit" version "2.3.0"
} }
println """ println """
@ -48,7 +47,7 @@ if (!project.hasProperty("artifactory_password")) ext.artifactory_password = ""
if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) { if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) {
try { try {
def repo = org.ajoberstar.grgit.Grgit.open(dir: '.') def repo = grgit.open()
ext.gitCommitHash = repo.head().abbreviatedId ext.gitCommitHash = repo.head().abbreviatedId
} catch (Exception e) { } catch (Exception e) {
println "Error getting commit hash: " + e.getMessage() println "Error getting commit hash: " + e.getMessage()
@ -100,7 +99,6 @@ subprojects {
repositories { repositories {
mavenCentral() mavenCentral()
maven { url "http://repo.bukkit.org/content/groups/public" }
maven { url "http://maven.sk89q.com/repo/" } maven { url "http://maven.sk89q.com/repo/" }
maven { url "http://repo.maven.apache.org/maven2" } maven { url "http://repo.maven.apache.org/maven2" }
} }

View File

@ -13,12 +13,6 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle' apply plugin: 'net.minecraftforge.gradle'
configurations.all {
resolutionStrategy {
force 'org.ow2.asm:asm:5.2'
}
}
def minecraftVersion = "1.13" def minecraftVersion = "1.13"
def forgeVersion = "24.0.16-1.13-pre" def forgeVersion = "24.0.16-1.13-pre"
@ -34,7 +28,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8 targetCompatibility = 1.8
minecraft { minecraft {
mappings channel: 'snapshot', version: '20181117' mappings channel: 'snapshot', version: '20181215'
// runDir = 'run' // runDir = 'run'
// replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java" // replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"