Merge branch 'dev' into patch-8

.gitlab-ci.yml

@@ -11,6 +11,7 @@ before_script:
   - apt-get update -qq && apt-get install -y -qq git git-core
 
 cache:
+  key: ${CI_COMMIT_REF_NAME}
   paths:
     - .gradle/wrapper
     - .gradle/caches
@@ -22,10 +23,14 @@ build:
     - git submodule sync
     - git submodule update --init --recursive
     - ./gradlew assemble
+    - mv LaunchServer/build/libs/*.jar LaunchServer
+    - mv ServerWrapper/build/libs/*.jar ServerWrapper
+    - mv modules/*_module/build/libs/*.jar modules
   artifacts:
     paths:
-      - LaunchServer/build/libs/*
+      - LaunchServer/*.jar
-      - ServerWrapper/build/libs/*.jar
+      - ServerWrapper/*.jar
+      - modules/*.jar
     expire_in: 1 week
 
 after_script:

LaunchServer/build.gradle

@@ -167,7 +167,9 @@ task dumpClientLibs(type: Copy) {
     publications {
         launchserverapi(MavenPublication) {
             artifactId = 'launchserver-api'
-            artifact cleanjar
+            artifact(cleanjar) {
+                classifier ""
+            }
             pom {
                 name = 'GravitLauncher LaunchServer API'
                 description = 'GravitLauncher LaunchServer Module API'
@@ -178,6 +180,18 @@ task dumpClientLibs(type: Copy) {
                         url = 'https://www.gnu.org/licenses/gpl-3.0.html'
                     }
                 }
+                developers {
+                    developer {
+                        id = 'gravit'
+                        name = 'Gravit'
+                        email = 'gravit.min@ya.ru'
+                    }
+                    developer {
+                        id = 'zaxar163'
+                        name = 'Zaxar163'
+                        email = 'zahar.vcherachny@yandex.ru'
+                    }
+                }
 
                 scm {
                     connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git'

LaunchServer/src/main/java/pro/gravit/launchserver/binary/JAConfigurator.java

@@ -92,6 +92,7 @@ public void setGuardType(String key) {
 
     public void push(final int value) {
         if (value >= -1 && value <= 5)
+         if (value >= -1 && value <= 5)
             constructor.instructions.add(new InsnNode(Opcodes.ICONST_0 + value));
         else if (value >= Byte.MIN_VALUE && value <= Byte.MAX_VALUE)
             constructor.instructions.add(new IntInsnNode(Opcodes.BIPUSH, value));

Launcher/build.gradle

@@ -62,7 +62,9 @@ task dumpLibs(type: Copy) {
     publications {
         launcherclientapi(MavenPublication) {
             artifactId = 'launcher-client-api'
-            artifact jar
+            artifact(jar) {
+                classifier ""
+            }
             pom {
                 name = 'GravitLauncher Client API'
                 description = 'GravitLauncher Client Module API'
@@ -73,6 +75,18 @@ task dumpLibs(type: Copy) {
                         url = 'https://www.gnu.org/licenses/gpl-3.0.html'
                     }
                 }
+                developers {
+                    developer {
+                        id = 'gravit'
+                        name = 'Gravit'
+                        email = 'gravit.min@ya.ru'
+                    }
+                    developer {
+                        id = 'zaxar163'
+                        name = 'Zaxar163'
+                        email = 'zahar.vcherachny@yandex.ru'
+                    }
+                }
                 scm {
                     connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git'
                     developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git'

LauncherAPI/build.gradle

@@ -15,7 +15,9 @@ compile project(':LauncherCore')
     publications {
         launcherwsapi(MavenPublication) {
             artifactId = 'launcher-ws-api'
-            artifact jar
+            artifact(jar) {
+                classifier ""
+            }
             pom {
                 name = 'GravitLauncher WebSocket API'
                 description = 'GravitLauncher WebSocket Module API'
@@ -26,6 +28,18 @@ compile project(':LauncherCore')
                         url = 'https://www.gnu.org/licenses/gpl-3.0.html'
                     }
                 }
+                developers {
+                    developer {
+                        id = 'gravit'
+                        name = 'Gravit'
+                        email = 'gravit.min@ya.ru'
+                    }
+                    developer {
+                        id = 'zaxar163'
+                        name = 'Zaxar163'
+                        email = 'zahar.vcherachny@yandex.ru'
+                    }
+                }
                 scm {
                     connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git'
                     developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git'

LauncherCore/build.gradle

@@ -17,7 +17,9 @@
     publications {
         launchercore(MavenPublication) {
             artifactId = 'launcher-core'
-            artifact jar
+            artifact(jar) {
+                classifier ""
+            }
             pom {
                 name = 'GravitLauncher Core Utils'
                 description = 'GravitLauncher Core Utils'
@@ -28,6 +30,18 @@
                         url = 'https://www.gnu.org/licenses/gpl-3.0.html'
                     }
                 }
+                developers {
+                    developer {
+                        id = 'gravit'
+                        name = 'Gravit'
+                        email = 'gravit.min@ya.ru'
+                    }
+                    developer {
+                        id = 'zaxar163'
+                        name = 'Zaxar163'
+                        email = 'zahar.vcherachny@yandex.ru'
+                    }
+                }
                 scm {
                     connection = 'scm:git:https://github.com/GravitLauncher/Launcher.git'
                     developerConnection = 'scm:git:ssh://git@github.com:GravitLauncher/Launcher.git'

LauncherCore/src/main/java/pro/gravit/utils/Version.java

@@ -22,9 +22,9 @@ public final class Version {
     public final Type release;
     public static final int MAJOR = 5;
     public static final int MINOR = 0;
-    public static final int PATCH = 6;
+    public static final int PATCH = 7;
     public static final int BUILD = 1;
-    public static final Version.Type RELEASE = Version.Type.STABLE;
+    public static final Version.Type RELEASE = Version.Type.DEV;
 
     @LauncherAPI
     public Version(int major, int minor, int patch) {

build.gradle

@@ -4,7 +4,7 @@
     id 'signing'
 }
 group = 'pro.gravit.launcher'
-version = '5.0.6'
+version = '5.0.7-SNAPSHOT'
 
 configure(subprojects.findAll { it.name != 'modules' }) {
     apply plugin: 'idea'