diff options
| author | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-17 18:08:42 +0100 |
|---|---|---|
| committer | Johann Bernhardt <johann.bernhardt@tum.de> | 2021-12-17 18:08:42 +0100 |
| commit | e57033b2aa14bb9f714fed5191a49babed7a4e32 (patch) | |
| tree | acd1b82d04199454d6d07efb85f0fd505d84f92e | |
| parent | cb309b464c5b2f8cbf0397a3b004075e1712db2e (diff) | |
| download | GT5-Unofficial-e57033b2aa14bb9f714fed5191a49babed7a4e32.tar.gz GT5-Unofficial-e57033b2aa14bb9f714fed5191a49babed7a4e32.tar.bz2 GT5-Unofficial-e57033b2aa14bb9f714fed5191a49babed7a4e32.zip | |
Refactor AVRcore to maven dependency
| -rw-r--r-- | .gitmodules | 3 | ||||
| m--------- | AVRcore | 0 | ||||
| -rw-r--r-- | addon.gradle | 14 | ||||
| -rw-r--r-- | dependencies.gradle | 2 | ||||
| -rw-r--r-- | gradle.properties | 2 |
5 files changed, 3 insertions, 18 deletions
diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 58eebb4aa5..0000000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "AVRcore"] - path = AVRcore - url = https://github.com/Technus/AVRcore diff --git a/AVRcore b/AVRcore deleted file mode 160000 -Subproject 27bf45ba7b08a0e3751b3e119e73441430bda49 diff --git a/addon.gradle b/addon.gradle deleted file mode 100644 index bd761b0518..0000000000 --- a/addon.gradle +++ /dev/null @@ -1,14 +0,0 @@ -sourceSets.main { - java.srcDir("AVRcore/src") -} - -task initAVRcore(type: Exec) { - description = "Updates (and inits) git submodules" - group = "Build Setup" - commandLine 'git', '--git-dir="' + projectDir.toString() + '\\.git"', 'submodule', 'update', '--init', '--recursive', '--remote' -} - -tasks.setupCIWorkspace.dependsOn initAVRcore -tasks.setupDevWorkspace.dependsOn initAVRcore -tasks.setupDecompWorkspace.dependsOn initAVRcore -tasks.compileJava.dependsOn initAVRcore diff --git a/dependencies.gradle b/dependencies.gradle index 7cff792573..dcbd6c060a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,6 +1,8 @@ // Add your dependencies here dependencies { + shadowImplementation("com.github.GTNewHorizons:AVRcore:add-build-script-SNAPSHOT") + compile("com.github.GTNewHorizons:GT5-Unofficial:master-SNAPSHOT:dev") compile("com.github.GTNewHorizons:Yamcl:master-SNAPSHOT:dev") diff --git a/gradle.properties b/gradle.properties index d18a0daa12..3d49d30e98 100644 --- a/gradle.properties +++ b/gradle.properties @@ -57,7 +57,7 @@ containsMixinsAndOrCoreModOnly = false # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. -usesShadowedDependencies = false +usesShadowedDependencies = true # Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older # projects. New projects should not use this parameter. |