diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 2e0b6b357..1e2545541 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -11,13 +11,8 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - - name: Clone Slime Java Commons - uses: actions/checkout@v2.3.4 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/setup-java@v2.1.0 @@ -37,13 +32,8 @@ jobs: steps: - uses: actions/checkout@v2.3.4 - - - name: Clone Slime Java Commons - uses: actions/checkout@v2.3.4 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/setup-java@v2.1.0 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..6ef9c1aa2 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "slime-java-commons"] + path = slime-java-commons + url = https://github.com/Eirenliel/slime-java-commons.git diff --git a/build.gradle b/build.gradle index 85b9bd796..8d4a29483 100644 --- a/build.gradle +++ b/build.gradle @@ -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' diff --git a/settings.gradle b/settings.gradle index 5962aec48..e204e193f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -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 - } -} \ No newline at end of file +include ':slime-java-commons' diff --git a/slime-java-commons b/slime-java-commons new file mode 160000 index 000000000..e3d14a0ff --- /dev/null +++ b/slime-java-commons @@ -0,0 +1 @@ +Subproject commit e3d14a0ffebcb20685555ff0775f59799e153dcd