mirror of
https://github.com/GravitLauncher/Launcher
synced 2024-11-15 11:39:11 +03:00
Merge branch 'dev' of github.com:GravitLauncher/Launcher into dev
This commit is contained in:
commit
1a3bf0b055
7 changed files with 20 additions and 2 deletions
|
@ -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) {
|
||||||
|
|
6
LauncherTest/build.gradle
Normal file
6
LauncherTest/build.gradle
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
apply from: '../test_support.gradle'
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
compile project(':LaunchServer')
|
||||||
|
}
|
||||||
|
|
0
LauncherTest/src/main/java/Empty.java
Normal file
0
LauncherTest/src/main/java/Empty.java
Normal file
0
LauncherTest/src/test/java/Empty.java
Normal file
0
LauncherTest/src/test/java/Empty.java
Normal 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
|
||||||
|
|
|
@ -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
11
test_support.gradle
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
dependencies {
|
||||||
|
testCompile 'org.junit.jupiter:junit-jupiter:5.4.1'
|
||||||
|
}
|
||||||
|
|
||||||
|
test {
|
||||||
|
useJUnitPlatform()
|
||||||
|
testLogging {
|
||||||
|
events "passed", "skipped", "failed"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue