Skip to content

Commit

Permalink
Further attempts
Browse files Browse the repository at this point in the history
  • Loading branch information
me4502 committed Feb 16, 2019
1 parent 6d1b372 commit 6a7951b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 13 deletions.
10 changes: 4 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,19 @@ buildscript {

configurations.all {
resolutionStrategy {
force 'com.google.guava:guava:21.0'
force 'org.ow2.asm:asm:6.0_BETA'
force 'commons-io:commons-io:2.4'
}
}

dependencies {
classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.7.5'
classpath 'org.ajoberstar:gradle-git:1.7.2'
classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:4.8.1'
}
}

plugins {
id 'net.minecrell.licenser' version '0.4.1' apply false
id "org.ajoberstar.grgit" version "2.3.0"
}

println """
Expand Down Expand Up @@ -48,7 +47,7 @@ if (!project.hasProperty("artifactory_password")) ext.artifactory_password = ""

if (!project.hasProperty("gitCommitHash") && !JavaVersion.current().isJava6()) {
try {
def repo = org.ajoberstar.grgit.Grgit.open(dir: '.')
def repo = grgit.open()
ext.gitCommitHash = repo.head().abbreviatedId
} catch (Exception e) {
println "Error getting commit hash: " + e.getMessage()
Expand Down Expand Up @@ -100,7 +99,6 @@ subprojects {

repositories {
mavenCentral()
maven { url "http://repo.bukkit.org/content/groups/public" }
maven { url "http://maven.sk89q.com/repo/" }
maven { url "http://repo.maven.apache.org/maven2" }
}
Expand Down
8 changes: 1 addition & 7 deletions worldedit-forge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@ buildscript {

apply plugin: 'net.minecraftforge.gradle'

configurations.all {
resolutionStrategy {
force 'org.ow2.asm:asm:5.2'
}
}

def minecraftVersion = "1.13"
def forgeVersion = "24.0.16-1.13-pre"

Expand All @@ -34,7 +28,7 @@ sourceCompatibility = 1.8
targetCompatibility = 1.8

minecraft {
mappings channel: 'snapshot', version: '20181117'
mappings channel: 'snapshot', version: '20181215'
// runDir = 'run'

// replaceIn "com/sk89q/worldedit/forge/ForgeWorldEdit.java"
Expand Down

0 comments on commit 6a7951b

Please sign in to comment.