Merge branch 'develop'

ADVisualizer · Dec 14, 2018 · a9c2bd4 · a9c2bd4
2 parents 802ef5c + 442ac6a
commit a9c2bd4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/bintray.json b/bintray.json
@@ -9,14 +9,14 @@
     ]
   },
   "version": {
-    "name": "1.2",
-    "released": "2018-12-07",
+    "name": "2.0",
+    "released": "2018-12-14",
     "gpgSign": false
   },
   "files": [
     {
       "includePattern": "build/libs/(.*)",
-      "uploadPattern": "/ch/hsr/adv/adv-lib/1.2/$1",
+      "uploadPattern": "/ch/hsr/adv/adv-lib/2.0/$1",
       "matrixParams": {
         "override": 1
       }

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'ch.hsr.adv'
-version = '1.2'
+version = '2.0'
 
 /****************************************
  * instructions for all projects
@@ -211,6 +211,16 @@ def pomConfig = {
             name 'Muriele Trentini'
             email '[email protected]'
         }
+        developer {
+            id 'jwinter'
+            name 'Jan Winter'
+            email '[email protected]'
+        }
+        developer {
+            id 'f2meier'
+            name 'Fabian Meier'
+            email '[email protected]'
+        }
     }
 
     scm {

diff --git a/lib-core/build.gradle b/lib-core/build.gradle
@@ -3,5 +3,5 @@ dependencies {
     compile "ch.qos.logback:logback-classic:1+"
 
     // common dependencies
-    compile 'ch.hsr.adv:adv-commons:1.2'
+    compile 'ch.hsr.adv:adv-commons:2.0'
 }