Browse Source

Revert "Make use of Composite Builds for OrbisLib"

This will break our build system even further, but
at least allow development to continue.

ForgeGradle 2.x cannot handle composite builds
correctly. As such, we won't be able to pin the
Aether II and Orbis against a specific version
of OrbisLib in our Maven repository while also
allowing developers to work the source code of both
projects at the same time.

We must be extremely careful not to let Orbis and
the Aether II diverge, or both mods could easily
become incompatible with one another.

This reverts commit 0eaa64f4
1.14.x
JellySquid 6 months ago
parent
commit
8e18148f2f
Signed by: Angeline <angeline@gildedgames.com> GPG Key ID: E8142FD7984F528E
3 changed files with 18 additions and 13 deletions
  1. 16
    5
      build.gradle
  2. 0
    1
      gradle.properties
  3. 2
    7
      settings.gradle

+ 16
- 5
build.gradle View File

@@ -14,6 +14,8 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'maven-publish'

def isPhosphorSubmodule = findProject(":Phosphor") != null

repositories {
mavenCentral()

@@ -22,16 +24,25 @@ repositories {
}

configurations {
compileShaded
compile.extendsFrom compileShaded

runtimeShaded
runtime.extendsFrom runtimeShaded

shaded
shaded.exclude group: "org.spongepowered"
}

dependencies {
runtime "me.jellysquid.mods:phosphor:${phosphor_version}:dev"
shaded "me.jellysquid.mods:phosphor:${phosphor_version}:universal"
if (isPhosphorSubmodule) {
runtime project(':phosphor')
} else {
runtime "me.jellysquid.mods:phosphor:${phosphor_version}:dev"
shaded "me.jellysquid.mods:phosphor:${phosphor_version}:universal"
}

compile "com.gildedgames:orbis-lib:${orbis_version}:dev"
shaded "com.gildedgames:orbis-lib:${orbis_version}:universal"
compileShaded project(":orbis-lib")
}

allprojects {
@@ -166,5 +177,5 @@ if (System.getenv("JARSIGN_SECRETS_FILE") != null) {

build.dependsOn apiJar
build.dependsOn serverJar
build.dependsOn gradle.includedBuilds*.task(':build')

jar.dependsOn ":orbis-lib:build"

+ 0
- 1
gradle.properties View File

@@ -4,4 +4,3 @@ minecraft_version=1.12.2
forge_version=14.23.5.2768
forge_mappings=stable_39
phosphor_version=1.12.2-0.2.4+build46
orbis_version=1.12.2-0.2.0+build7

+ 2
- 7
settings.gradle View File

@@ -1,9 +1,4 @@
rootProject.name = 'aether-ii'

if (file("lib/orbis-lib/build.gradle").exists()) {
includeBuild('lib/orbis-lib') {
dependencySubstitution {
substitute module('com.gildedgames:orbis-lib') with project(':')
}
}
}
include 'orbis-lib'
project(':orbis-lib').projectDir = file("lib/orbis-lib")

Loading…
Cancel
Save