Merge remote-tracking branch 'refs/remotes/BrassGoggledCoders/master'

Conflicts:
	MineTweaker3-MC1102-Mod-JEI/build.gradle
This commit is contained in:
Jared committed 2016-09-23 18:25:05 +02:00
commit 8a2a54be11
6 files changed
+162 -22

No files matched your search

+36
View File
@@ -13,6 +13,7 @@ buildscript {
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -55,3 +56,38 @@ processResources
exclude 'mcmod.info'
}
}
uploadArchives {
repositories {
mavenDeployer {
repository(url: "file://" + System.getenv("local_maven"))
pom {
groupId = project.group
version
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'CraftTweaker'
url 'https://github.com/jaredlll08/CraftTweaker'
scm {
url 'https://github.com/jaredlll08/CraftTweaker.git'
connection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
developerConnection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
}
issueManagement {
system 'github'
url 'https://github.com/jaredlll08/CraftTweaker/issues'
}
developers {
developer {
id 'Jared'
name 'Jared'
roles { role 'developer' }
}
}
}
}
}
}
}
+1 -1
View File
@@ -41,7 +41,7 @@ dependencies {
compile project(':ZenScript')
compile project(':MineTweaker3-API')
compile project(':MineTweaker3-MC1102-Main')
deobfCompile "mezz.jei:jei_1.10.2:3.9.3.252"
deobfCompile "mezz.jei:jei_1.10.2:3.9.7.260"
}
task makeRegistry(type: RegisterZenClassesTask) {
+36
View File
@@ -18,6 +18,7 @@ buildscript {
}
apply plugin: 'forge'
apply plugin: 'maven'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -61,3 +62,38 @@ processResources
exclude 'mcmod.info'
}
}
uploadArchives {
repositories {
mavenDeployer {
repository(url: "file://" + System.getenv("local_maven"))
pom {
groupId = project.group
version
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'CraftTweaker'
url 'https://github.com/jaredlll08/CraftTweaker'
scm {
url 'https://github.com/jaredlll08/CraftTweaker.git'
connection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
developerConnection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
}
issueManagement {
system 'github'
url 'https://github.com/jaredlll08/CraftTweaker/issues'
}
developers {
developer {
id 'Jared'
name 'Jared'
roles { role 'developer' }
}
}
}
}
}
}
}
+36
View File
@@ -13,6 +13,7 @@ buildscript {
}
}
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
@@ -55,3 +56,38 @@ processResources
exclude 'mcmod.info'
}
}
uploadArchives {
repositories {
mavenDeployer {
repository(url: "file://" + System.getenv("local_maven"))
pom {
groupId = project.group
version
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'CraftTweaker'
url 'https://github.com/jaredlll08/CraftTweaker'
scm {
url 'https://github.com/jaredlll08/CraftTweaker.git'
connection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
developerConnection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
}
issueManagement {
system 'github'
url 'https://github.com/jaredlll08/CraftTweaker/issues'
}
developers {
developer {
id 'Jared'
name 'Jared'
roles { role 'developer' }
}
}
}
}
}
}
}
+1
View File
@@ -1,4 +1,5 @@
apply plugin: 'java'
apply plugin: 'maven'
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
+52 -21
View File
@@ -7,7 +7,7 @@ apply plugin: "maven"
subprojects {
apply from: rootProject.file('common.gradle')
}
repositories {
repositories {
mavenLocal()
mavenCentral()
maven {
@@ -29,13 +29,42 @@ configurations {
dependencies {
deployerJars 'org.apache.maven.wagon:wagon-ftp:2.2'
}
uploadArchives {
repositories {
mavenDeployer {
repository(url: "file:///var/www/html/maven")
}
}
repositories {
mavenDeployer {
repository(url: "file://" + System.getenv("local_maven"))
pom {
groupId = project.group
version
artifactId = project.archivesBaseName
project {
name project.archivesBaseName
packaging 'jar'
description 'CraftTweaker'
url 'https://github.com/jaredlll08/CraftTweaker'
scm {
url 'https://github.com/jaredlll08/CraftTweaker.git'
connection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
developerConnection 'scm:git:[email protected]:jaredlll08/CraftTweaker.git'
}
issueManagement {
system 'github'
url 'https://github.com/jaredlll08/CraftTweaker/issues'
}
developers {
developer {
id 'Jared'
name 'Jared'
roles { role 'developer' }
}
}
}
}
}
}
}
task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') {
gradleVersion = '2.6'
}
@@ -51,10 +80,10 @@ task assembleMC1710(type: Jar, dependsOn: [\
':MineTweaker3-API:build']
+ projects1710.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.7.10-${mineTweakerVersion}.jar"
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
for (p in projects1710) {
from zipTree(project(p).jar.archivePath)
}
@@ -65,10 +94,10 @@ task assembleMC18(type: Jar, dependsOn: [\
':MineTweaker3-API:build']
+ projects18.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.8.9-${mineTweakerVersion}.jar"
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
for (p in projects18) {
from zipTree(project(p).jar.archivePath)
}
@@ -79,10 +108,10 @@ task assembleMC1102(type: Jar, dependsOn: [\
':MineTweaker3-API:build']
+ projects1102.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-1.10.2-${mineTweakerVersion}.jar"
from zipTree(project(":ZenScript").jar.archivePath)
from zipTree(project(':MineTweaker3-API').jar.archivePath)
for (p in projects1102) {
from zipTree(project(p).jar.archivePath)
}
@@ -93,7 +122,7 @@ task assembleDevBase1710(type: Jar, dependsOn: [
':MineTweaker3-API:build',
':MineTweaker3-MC1710-Main:build']) {
archiveName="CraftTweaker-Dev-1.7.10-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
from project(':MineTweaker3-MC1710-Main').sourceSets.main.output
@@ -104,7 +133,7 @@ task assembleDevBase18(type: Jar, dependsOn: [
':MineTweaker3-API:build',
':MineTweaker3-MC18-Main:build']) {
archiveName="CraftTweaker-Dev-1.8.9-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
from project(':MineTweaker3-MC18-Main').sourceSets.main.output
@@ -115,7 +144,7 @@ task assembleDevBase1102(type: Jar, dependsOn: [
':MineTweaker3-API:build',
':MineTweaker3-MC1102-Main:build']) {
archiveName="CraftTweaker-Dev-1.10.2-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
from project(':MineTweaker3-MC1102-Main').sourceSets.main.output
@@ -126,10 +155,10 @@ task assembleDevFull1710(type: Jar, dependsOn: [
':MineTweaker3-API:build']
+ projects1710.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.7.10-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
for (p in projects1710) {
from project(p).sourceSets.main.output
}
@@ -141,10 +170,10 @@ task assembleDevFull18(type: Jar, dependsOn: [
':MineTweaker3-API:build']
+ projects18.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.8.9-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
for (p in projects18) {
from project(p).sourceSets.main.output
}
@@ -155,10 +184,10 @@ task assembleDevFull1102(type: Jar, dependsOn: [
':MineTweaker3-API:build']
+ projects1102.collect { ':' + it + ":build" }) {
archiveName="CraftTweaker-Dev-Full-1.10.2-${mineTweakerVersion}.jar"
from project(':ZenScript').sourceSets.main.output
from project(':MineTweaker3-API').sourceSets.main.output
for (p in projects1102) {
from project(p).sourceSets.main.output
}
@@ -182,3 +211,5 @@ configurations {