Merge branch 'dev' of github.com:GravitLauncher/Launcher into dev

This commit is contained in:
Gravit 2019-04-03 14:05:53 +07:00
commit 1a3bf0b055
No known key found for this signature in database
GPG key ID: 061981E1E85D3216
7 changed files with 20 additions and 2 deletions

View file

@ -28,7 +28,6 @@
dependencies { dependencies {
pack project(':LauncherAPI') // Not error on obf. pack project(':LauncherAPI') // Not error on obf.
bundle 'com.github.oshi:oshi-core:3.13.0' bundle 'com.github.oshi:oshi-core:3.13.0'
bundle 'commons-codec:commons-codec:1.11'
} }
task genRuntimeJS(type: Zip) { task genRuntimeJS(type: Zip) {

View file

@ -0,0 +1,6 @@
apply from: '../test_support.gradle'
dependencies {
compile project(':LaunchServer')
}

View file

View file

View file

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
git clone https://github.com/GravitLauncher/Launcher.git git clone https://github.com/GravitLauncher/Launcher.git
cd Launcher
sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
git submodule update --init --recursive git submodule update --init --recursive

View file

@ -1,6 +1,7 @@
dependencies { dependencies {
compileOnly project(':LaunchServer') compileOnly project(':LaunchServer')
} }
jar { jar {
from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } } from { configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) } }
} }

11
test_support.gradle Normal file
View file

@ -0,0 +1,11 @@
dependencies {
testCompile 'org.junit.jupiter:junit-jupiter:5.4.1'
}
test {
useJUnitPlatform()
testLogging {
events "passed", "skipped", "failed"
}
}