Squashed commit of the following:
Simon Leischnig
Branch: simlei/opal_hiwi:feature/sbt1.1.0-squashed
Branch: delors/opal:develop
Merged
Merged pull request
Merged in simlei/opal_hiwi/feature/sbt1.1.0-squashed (pull request #462)
Merged in simlei/opal_hiwi/feature/sbt1.1.0-squashed (pull request #462)
Updates OPAL and its components (except the inactive BugPicker until further notice) to sbt 1.1.0 See issue #130 for further information.
commit 52d9e98eb8f8ee79f17499e3174125d646a341f5 Author: SimonL simon-jena@gmx.net Date: Wed Jan 31 20:56:36 2018 +0100
reintegrated current develop branch changescommit 3cc01a06651adc74724502734d911fc0df7cf3c8 Merge: 1603b20 8d4cfb9 Author: SimonL simon-jena@gmx.net Date: Wed Jan 31 12:54:12 2018 +0100
concurrent channges in develop merged -- Merge branch 'develop' into feature/sbt1.1.0commit 1603b205bf3343c28bdf913b753eb55d285fc649 Author: SimonL simon-jena@gmx.net Date: Wed Jan 31 11:55:30 2018 +0100
removed stale filecommit c53e499c02de968a139d114adb53b11a0f2b6278 Author: SimonL simon-jena@gmx.net Date: Wed Jan 31 11:23:51 2018 +0100
Removed unused imports in sbt-java-fixture-compilercommit 4b74fe6ead2192e104dd93d0931e8b53d1d017d5 Author: SimonL simon-jena@gmx.net Date: Wed Jan 31 11:21:56 2018 +0100
updated java fixture compiler to sbt 1.1.0, Scala v. 2.12.4commit 30ec98dd99c6c9d82dd920d1275e3214a40358ac Merge: 9f009be d9a5402 Author: SimonL simon-jena@gmx.net Date: Wed Jan 31 11:06:55 2018 +0100
probably buggy reintegration of sbt migration to 1.0.2 and develop to sbt 1.1.0commit 9f009be4d9c3f4153c8162dbcad750cfc455c74a Author: SimonL simon-jena@gmx.net Date: Thu Dec 7 14:42:42 2017 +0100
aggregated changes vs. master for updating to sbt 1.0.xcommit ab1981c5d4eba9cad432d6d56c22d64b73119827 Merge: f6fc429 733109f Author: Michael Eichberg mail@michael-eichberg.de Date: Thu Dec 7 10:36:22 2017 +0100
Merge branch 'develop' into feature/sbt1.0.x Signed-off-by: Michael Eichberg <mail@michael-eichberg.de> # Conflicts: # DEVELOPING_OPAL/plugins/sbt-java-fixture-compiler/build.sbtcommit f6fc429cc3068665704c250ed20467e95939fe9f Author: Michael Eichberg mail@michael-eichberg.de Date: Wed Oct 25 15:10:28 2017 +0200
moving towards sbt1.0.x Signed-off-by: Michael Eichberg <mail@michael-eichberg.de>