aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.circleci/config.yml9
-rw-r--r--.gradle/2.0/taskArtifacts/cache.properties1
-rw-r--r--.gradle/2.0/taskArtifacts/cache.properties.lockbin0 -> 17 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/fileHashes.binbin0 -> 521607 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/fileSnapshots.binbin0 -> 4430057 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/outputFileStates.binbin0 -> 18872 bytes
-rw-r--r--.gradle/2.0/taskArtifacts/taskArtifacts.binbin0 -> 29153 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/fileHashes.binbin0 -> 441391 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/fileSnapshots.binbin0 -> 9294227 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/taskArtifacts.binbin0 -> 76573 bytes
-rw-r--r--.gradle/3.2.1/taskArtifacts/taskArtifacts.lockbin0 -> 17 bytes
-rw-r--r--.gradle/gradle.log27
-rw-r--r--build.gradle5
13 files changed, 38 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 13dcbbb9fa..086d399b75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,14 +31,15 @@ jobs:
# fallback to using the latest cache if no exact match is found
- v1-dependencies-
- - run: gradle setupDecompWorkspace
- - run: gradle eclipse
- - run: gradle clean build
- - run: gradle dependencies
+ - run: gradle setupDecompWorkspace eclipse clean build test
+ # - run: gradle eclipse
+ # - run: gradle clean build
+ # - run: gradle dependencies
- save_cache:
paths:
- ~/.gradle
+ - ~/.m2
key: v1-dependencies-{{ checksum "build.gradle" }}
# run tests!
diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties
new file mode 100644
index 0000000000..8882797c67
--- /dev/null
+++ b/.gradle/2.0/taskArtifacts/cache.properties
@@ -0,0 +1 @@
+#Sun Apr 01 01:00:20 AEST 2018
diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock
new file mode 100644
index 0000000000..f33ec6d27f
--- /dev/null
+++ b/.gradle/2.0/taskArtifacts/cache.properties.lock
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/fileHashes.bin b/.gradle/2.0/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000000..6e8e8c8a9a
--- /dev/null
+++ b/.gradle/2.0/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 0000000000..c7cf0e52eb
--- /dev/null
+++ b/.gradle/2.0/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/outputFileStates.bin b/.gradle/2.0/taskArtifacts/outputFileStates.bin
new file mode 100644
index 0000000000..ef2b32791e
--- /dev/null
+++ b/.gradle/2.0/taskArtifacts/outputFileStates.bin
Binary files differ
diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000000..c2a3ca022f
--- /dev/null
+++ b/.gradle/2.0/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/fileHashes.bin b/.gradle/3.2.1/taskArtifacts/fileHashes.bin
new file mode 100644
index 0000000000..371cf8d9c3
--- /dev/null
+++ b/.gradle/3.2.1/taskArtifacts/fileHashes.bin
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/3.2.1/taskArtifacts/fileSnapshots.bin
new file mode 100644
index 0000000000..43e870401e
--- /dev/null
+++ b/.gradle/3.2.1/taskArtifacts/fileSnapshots.bin
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/3.2.1/taskArtifacts/taskArtifacts.bin
new file mode 100644
index 0000000000..b54a1d2bac
--- /dev/null
+++ b/.gradle/3.2.1/taskArtifacts/taskArtifacts.bin
Binary files differ
diff --git a/.gradle/3.2.1/taskArtifacts/taskArtifacts.lock b/.gradle/3.2.1/taskArtifacts/taskArtifacts.lock
new file mode 100644
index 0000000000..3002f29b85
--- /dev/null
+++ b/.gradle/3.2.1/taskArtifacts/taskArtifacts.lock
Binary files differ
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
new file mode 100644
index 0000000000..b66ee14430
--- /dev/null
+++ b/.gradle/gradle.log
@@ -0,0 +1,27 @@
+:compileApiJava UP-TO-DATE
+:processApiResources UP-TO-DATE
+:apiClasses UP-TO-DATE
+:sourceMainJava UP-TO-DATE
+:compileJava UP-TO-DATE
+:processResources UP-TO-DATE
+:classes UP-TO-DATE
+:devJar UP-TO-DATE
+:jar
+:compileTestJava UP-TO-DATE
+:processTestResources UP-TO-DATE
+:testClasses UP-TO-DATE
+:test UP-TO-DATE
+:extractMcpData UP-TO-DATE
+:getVersionJson
+:extractUserDev UP-TO-DATE
+:genSrgs SKIPPED
+:reobf
+:sourceJar UP-TO-DATE
+:assemble
+:check UP-TO-DATE
+:build
+:gitChangelogTask
+
+BUILD SUCCESSFUL
+
+Total time: 17.083 secs
diff --git a/build.gradle b/build.gradle
index fb9cde1887..64e7327267 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,6 +55,11 @@ archivesBaseName = "GT-PlusPlus"
version = "1.7.0-prerelease-19-early-test2"
minecraft.version = "1.7.10-10.13.4.1614-1.7.10"
+minecraft {
+ version = "1.7.10-10.13.4.1614-1.7.10"
+ runDir = "$projectDir"
+}
+
//Gradle Tweak
//Prevent java 8's strict doclint for javadocs from failing builds
allprojects {