Merge pull request #58 from adigyran/main

slime commons as submodule
This commit is contained in:
Eiren Rain authored and GitHub committed 2021-10-02 19:46:34 +03:00
commit c7aaffa5e6
5 files changed
+15 -34

No files matched your search

+2 -12
View File
@@ -11,13 +11,8 @@ jobs:
steps:
- uses: actions/[email protected]
- name: Clone Slime Java Commons
uses: actions/[email protected]
with:
repository: Eirenliel/slime-java-commons
# Relative path under $GITHUB_WORKSPACE to place the repository
path: Slime Java Commons
submodules: recursive
- name: Set up JDK 8
uses: actions/[email protected]
@@ -37,13 +32,8 @@ jobs:
steps:
- uses: actions/[email protected]
- name: Clone Slime Java Commons
uses: actions/[email protected]
with:
repository: Eirenliel/slime-java-commons
# Relative path under $GITHUB_WORKSPACE to place the repository
path: Slime Java Commons
submodules: recursive
- name: Set up JDK 8
uses: actions/[email protected]
+3
View File
@@ -0,0 +1,3 @@
[submodule "slime-java-commons"]
path = slime-java-commons
url = https://github.com/Eirenliel/slime-java-commons.git
+8 -6
View File
@@ -34,15 +34,17 @@ tasks.withType(Javadoc) {
options.encoding = 'UTF-8'
}
repositories {
// Use jcenter for resolving dependencies.
// You can declare any Maven/Ivy/file repository here.
jcenter()
mavenCentral()
allprojects {
repositories {
// Use jcenter for resolving dependencies.
// You can declare any Maven/Ivy/file repository here.
jcenter()
mavenCentral()
}
}
dependencies {
compile project(':Slime Java Commons')
compile project(':slime-java-commons')
// This dependency is exported to consumers, that is to say found on their compile classpath.
compile 'org.apache.commons:commons-math3:3.6.1'
+1 -16
View File
@@ -8,19 +8,4 @@
*/
rootProject.name = 'SlimeVR Server'
include('Slime Java Commons')
def commonsDirs = [
new File(settingsDir, 'Slime Java Commons'),
new File(settingsDir, 'slime-java-commons'),
new File(settingsDir, '../Slime Java Commons'),
new File(settingsDir, '../slime-java-commons')
]
for (commonsDir in commonsDirs) {
if (commonsDir.isDirectory()) {
logger.info('\"Slime Java Commons\" subproject detected at \"{}\"', commonsDir.getCanonicalPath())
project(':Slime Java Commons').projectDir = commonsDir
break
}
}
include ':slime-java-commons'
Submodule slime-java-commons added at e3d14a0ffe.