From fbff9e865d08af1207ca16876ab0f11657f3e87a Mon Sep 17 00:00:00 2001 From: Jason Martens Date: Mon, 10 Apr 2017 11:24:16 -0700 Subject: = travis: Add cross-compile to travis build and fix akka compile dependencies (#450) --- .../main/scala-2.10/kamon/ActorSystemTools.scala | 25 ++++++++++++++++++ .../main/scala-2.11/kamon/ActorSystemTools.scala | 25 ++++++++++++++++++ .../main/scala-2.12/kamon/ActorSystemTools.scala | 25 ++++++++++++++++++ .../src/main/scala/kamon/ActorSystemTools.scala | 30 ---------------------- travis-test.sh | 1 + 5 files changed, 76 insertions(+), 30 deletions(-) create mode 100644 kamon-core/src/main/scala-2.10/kamon/ActorSystemTools.scala create mode 100644 kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala create mode 100644 kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala delete mode 100644 kamon-core/src/main/scala/kamon/ActorSystemTools.scala diff --git a/kamon-core/src/main/scala-2.10/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala-2.10/kamon/ActorSystemTools.scala new file mode 100644 index 00000000..01dd4234 --- /dev/null +++ b/kamon-core/src/main/scala-2.10/kamon/ActorSystemTools.scala @@ -0,0 +1,25 @@ +/* ========================================================================================= + * Copyright © 2013-2016 the kamon project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ +package kamon + +import scala.util.control.NonFatal + +import akka.actor.ActorSystem + +object ActorSystemTools { + private[kamon] def terminateActorSystem(system: ActorSystem): Unit = { + system.shutdown() + } +} diff --git a/kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala new file mode 100644 index 00000000..01dd4234 --- /dev/null +++ b/kamon-core/src/main/scala-2.11/kamon/ActorSystemTools.scala @@ -0,0 +1,25 @@ +/* ========================================================================================= + * Copyright © 2013-2016 the kamon project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ +package kamon + +import scala.util.control.NonFatal + +import akka.actor.ActorSystem + +object ActorSystemTools { + private[kamon] def terminateActorSystem(system: ActorSystem): Unit = { + system.shutdown() + } +} diff --git a/kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala new file mode 100644 index 00000000..762201d5 --- /dev/null +++ b/kamon-core/src/main/scala-2.12/kamon/ActorSystemTools.scala @@ -0,0 +1,25 @@ +/* ========================================================================================= + * Copyright © 2013-2016 the kamon project + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software distributed under the + * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, + * either express or implied. See the License for the specific language governing permissions + * and limitations under the License. + * ========================================================================================= + */ +package kamon + +import akka.actor.ActorSystem + +import scala.util.control.NonFatal + +object ActorSystemTools { + private[kamon] def terminateActorSystem(system: ActorSystem): Unit = { + system.terminate() + } +} diff --git a/kamon-core/src/main/scala/kamon/ActorSystemTools.scala b/kamon-core/src/main/scala/kamon/ActorSystemTools.scala deleted file mode 100644 index 31c8e7e7..00000000 --- a/kamon-core/src/main/scala/kamon/ActorSystemTools.scala +++ /dev/null @@ -1,30 +0,0 @@ -/* ========================================================================================= - * Copyright © 2013-2016 the kamon project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the - * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, - * either express or implied. See the License for the specific language governing permissions - * and limitations under the License. - * ========================================================================================= - */ -package kamon - -import scala.util.control.NonFatal - -import akka.actor.ActorSystem - -object ActorSystemTools { - //first try akka 2.4 system terminate() and then failover to akka 2.3 system shutdown() - private[kamon] def terminateActorSystem(system: ActorSystem): Unit = { - try { - system.terminate() - } catch { - case NonFatal(e) => system.shutdown() - } - } -} diff --git a/travis-test.sh b/travis-test.sh index 5ccd9fe0..b106f2f5 100755 --- a/travis-test.sh +++ b/travis-test.sh @@ -6,6 +6,7 @@ runTests () { sbt -Dakka.test.timefactor=1.5 \ 'set concurrentRestrictions in Global += Tags.limit(Tags.Compile, 2)' \ 'set testOptions in test in Global := Seq(Tests.Argument(TestFrameworks.ScalaTest, "-oUNCXHELPOQRM"))' \ + '+ compile' \ test || exit 1 echo "[info] $(date) - finished sbt test" -- cgit v1.2.3