From aa4601c27689b0c9ac87ca53bbe401e27cfce9fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sat, 6 Sep 2014 16:54:57 +0200
Subject: [PATCH] Build script cleanup.

---
 .gitignore             | 20 ++++++++++++++++++++
 build.gradle           | 43 ++++++++++++++++++++++++++++++++++++++++--
 build.properties       |  2 +-
 gradle/artifact.gradle | 13 -------------
 gradle/forge.gradle    | 27 --------------------------
 gradle/release.gradle  | 15 ---------------
 6 files changed, 62 insertions(+), 58 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 gradle/artifact.gradle
 delete mode 100644 gradle/forge.gradle
 delete mode 100644 gradle/release.gradle

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..d17ce1c36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,20 @@
+# Gradle
+/.gradle
+/build
+
+# Eclipse
+/.classpath
+/.project
+/.settings
+/bin
+
+# IntelliJ IDEA
+/*.iml
+/*.ipr
+/*.iws
+/.idea
+/out
+
+# Debugging
+/eclipse
+/run
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 60da6a73f..c89a6c89b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -29,5 +29,44 @@ if (System.getenv("BUILD_NUMBER") != null)
 ext.simpleVersion = version
 version = "MC${config.minecraft.version}-${project.version}"
 
-apply from: 'gradle/forge.gradle'
-apply from: 'gradle/artifact.gradle'
+repositories {
+    maven {
+        name = "oc"
+        url = "http://maven.cil.li/"
+    }
+}
+
+dependencies {
+    compile "li.cil.oc:OpenComputers:MC${config.minecraft.version}-${config.oc.version}:api"
+}
+
+minecraft {
+    version = "${config.minecraft.version}-${config.forge.version}"
+
+    replaceIn "li/cil/occ/OpenComponents.java"
+    replace "@VERSION@", project.simpleVersion
+}
+
+processResources {
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+        expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
+    }
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+}
+
+jar {
+    classifier = 'universal'
+}
+
+// because the normal default jar task has been modified to be obfuscated
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'deobf'
+}
+
+artifacts {
+    archives deobfJar
+}
diff --git a/build.properties b/build.properties
index c42593f05..3a64bcff7 100644
--- a/build.properties
+++ b/build.properties
@@ -1,4 +1,4 @@
 minecraft.version=1.6.4
 forge.version=9.11.1.964
-oc.version=1.3.0.433-beta.1
+oc.version=1.3.+
 occ.version=0.2.0
\ No newline at end of file
diff --git a/gradle/artifact.gradle b/gradle/artifact.gradle
deleted file mode 100644
index 831b1e558..000000000
--- a/gradle/artifact.gradle
+++ /dev/null
@@ -1,13 +0,0 @@
-jar {
-    classifier = 'universal'
-}
-
-// because the normal default jar task has been modified to be obfuscated
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'deobf'
-}
-
-artifacts {
-    archives deobfJar
-}
diff --git a/gradle/forge.gradle b/gradle/forge.gradle
deleted file mode 100644
index 87d5c0604..000000000
--- a/gradle/forge.gradle
+++ /dev/null
@@ -1,27 +0,0 @@
-repositories {
-    maven {
-        name = "oc"
-        url = "http://maven.cil.li/"
-    }
-}
-
-dependencies {
-    compile group: 'li.cil.oc', name: 'OpenComputers', version: "MC${config.minecraft.version}-${config.oc.version}", classifier: 'api'
-}
-
-minecraft {
-    version = "${config.minecraft.version}-${config.forge.version}"
-
-    replaceIn "li/cil/occ/OpenComponents.java"
-    replace "@VERSION@", project.simpleVersion
-}
-
-processResources {
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
-    }
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
-    }
-}
diff --git a/gradle/release.gradle b/gradle/release.gradle
deleted file mode 100644
index 9c7607807..000000000
--- a/gradle/release.gradle
+++ /dev/null
@@ -1,15 +0,0 @@
-apply plugin: 'maven-publish'
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact apiJar
-            artifact deobfJar
-        }
-    }
-    repositories {
-        maven {
-            url "${config.maven.url}"
-        }
-    }
-}