Merge branch 'develop'

W1nt0r · W1nt0r · commit a9c2bd4fd997 · 2018-12-14T14:43:24.000+01:00
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 'mtrentin@hsr.ch'
         }
+        developer {
+            id 'jwinter'
+            name 'Jan Winter'
+            email 'jwinter@hsr.ch'
+        }
+        developer {
+            id 'f2meier'
+            name 'Fabian Meier'
+            email 'f2meier@hsr.ch'
+        }
     }
 
     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'
 }

Original file line number	Diff line number	Diff line change
`@@ -9,14 +9,14 @@`
`9`	`9`	`]`
`10`	`10`	`},`
`11`	`11`	`"version": {`
`12`		`- "name": "1.2",`
`13`		`- "released": "2018-12-07",`
	`12`	`+ "name": "2.0",`
	`13`	`+ "released": "2018-12-14",`
`14`	`14`	`"gpgSign": false`
`15`	`15`	`},`
`16`	`16`	`"files": [`
`17`	`17`	`{`
`18`	`18`	`"includePattern": "build/libs/(.*)",`
`19`		`- "uploadPattern": "/ch/hsr/adv/adv-lib/1.2/$1",`
	`19`	`+ "uploadPattern": "/ch/hsr/adv/adv-lib/2.0/$1",`
`20`	`20`	`"matrixParams": {`
`21`	`21`	`"override": 1`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@ dependencies {`
`3`	`3`	`compile "ch.qos.logback:logback-classic:1+"`
`4`	`4`
`5`	`5`	`// common dependencies`
`6`		`- compile 'ch.hsr.adv:adv-commons:1.2'`
	`6`	`+ compile 'ch.hsr.adv:adv-commons:2.0'`
`7`	`7`	`}`