Fixes bad android SDK url (#113)

* Fixes bad android SDK url

* fixes sbt configuration

* Avoids uncompressing encoded files on non release builds

.travis.yml

@@ -33,23 +33,25 @@ env:
     - secure: "bJzXS/Uhyrfl0Hr6FE856i0EOipG/8J12Sq/HaJdLwZ1c7Ns1eNQ1trSKN7plzRuY1ybiMgp3BHvkLDZkAaxfVNgyTl+REyMXr58ns1kIP9obTcHNxz/X2DXbILpFbngmNdf1LAvBDNVFbPaDUjUF9zUY31SUspjYE3gfflcAF0="
     - secure: "WhPCWomgfcK/zMJYc5IMN82Gb2lXhCVt0XedSCAcOCsbNW/jeUN87ZleshhIuZgf/jQ6yHJ0X0Btiy4IpayrBI0n6Zg74MMnQ802etPeuBlxqQjdoBLsj0EGMxFtKrJap3mpfpmWvy8g0Mgcvxh4f3k+CPV5GCBxWOphEm9eH8Q="
 before_install:
-- wget http://dl.google.com/android/android-sdk_r25-linux.tgz
-- tar xf android-sdk_r25-linux.tgz
+- wget http://dl.google.com/android/android-sdk_r24-linux.tgz
+- tar xf android-sdk_r24-linux.tgz 
 - export ANDROID_HOME=$PWD/android-sdk-linux
 - export ANDROID_SDK_HOME=$PWD/android-sdk-linux
 - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
 - echo yes | android update sdk --all --filter platform-tools --no-ui
 - echo yes | android update sdk --all --filter build-tools-25.0.0 --no-ui
-- echo yes | android update sdk --all --filter android-25 --no-ui
+- echo yes | android update sdk --all --filter android-24 --no-ui
 - echo yes | android update sdk --all --filter extra-android-support --no-ui
 - echo yes | android update sdk --all --filter extra-android-m2repository --no-ui
-- export GPG_FOLDER=$TRAVIS_BUILD_DIR
-- openssl aes-256-cbc -K $encrypted_7931e7eaa203_key -iv $encrypted_7931e7eaa203_iv -in rings.tar.enc -out rings.tar -d
-- tar -xvf $TRAVIS_BUILD_DIR/rings.tar -C $TRAVIS_BUILD_DIR
+- if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then
+    export GPG_FOLDER=$TRAVIS_BUILD_DIR;
+    openssl aes-256-cbc -K $encrypted_7931e7eaa203_key -iv $encrypted_7931e7eaa203_iv -in rings.tar.enc -out rings.tar -d;
+    tar -xvf $TRAVIS_BUILD_DIR/rings.tar -C $TRAVIS_BUILD_DIR;
+  fi
 script:
   - sbt ++$TRAVIS_SCALA_VERSION clean test
 after_success:
 - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && sbt ++$TRAVIS_SCALA_VERSION "project core" "publishSnapshot"
 - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && sbt ++$TRAVIS_SCALA_VERSION "project akka" "publishSnapshot"
 - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && sbt ++$TRAVIS_SCALA_VERSION "project viewable" "publishSnapshot"
-- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && sbt ++$TRAVIS_SCALA_VERSION "project extras" "publishSnapshot"
+- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && sbt ++$TRAVIS_SCALA_VERSION "project extras" "publishSnapshot"

build.sbt

@@ -30,9 +30,13 @@ lazy val core = (project in file("macroid-core"))
     unmanagedClasspath in Test ++= (bootClasspath in Android).value,
     unmanagedSourceDirectories in Test := Seq(
       baseDirectory.value / "src" / "test" / "scala"),
-    libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %% "scala-async" % "0.9.6"
-    )
+    libraryDependencies += {
+      val scalaAsyncVersion = (scalaBinaryVersion in update).value match {
+        case "2.10" => "0.9.5"
+        case _ => "0.9.7"
+      }
+      "org.scala-lang.modules" %% "scala-async" % scalaAsyncVersion
+    }
   )
 
 lazy val viewable = (project in file("macroid-viewable"))
@@ -58,7 +62,7 @@ lazy val akka = (project in file("macroid-akka"))
     unmanagedClasspath in Test ++= (bootClasspath in Android).value,
     homepage := Some(
       url("http://47deg.github.io/macroid/docs/modules/Akka.html")),
-    libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.5.3"
+    libraryDependencies += "com.typesafe.akka" %% "akka-actor" % "2.3.16"
   )
   .dependsOn(core)
 

macroid-akka/src/main/scala/macroid/akka/Akka.scala

@@ -48,7 +48,7 @@ abstract class FragmentActor[F <: Fragment: ClassTag] extends Actor {
   def receiveUi: PartialFunction[Any, Any] = {
     case a @ AttachUi(f: F) ⇒
       attachedUi = Some(f); a
-    case d @ DetachUi(f: F) if attachedUi.contains(f) ⇒
+    case d @ DetachUi(f: F) if attachedUi.exists(_ == f) ⇒
       attachedUi = None; d
     case x ⇒ x
   }

project/ProjectPlugin.scala

@@ -39,15 +39,14 @@ object ProjectPlugin extends AutoPlugin {
       scalacOptions ++= Seq(
         "-feature",
         "-deprecation",
-        "-target:jvm-1.8",
         "-encoding",
         "UTF-8",
         "-unchecked",
         "-Xlint",
         "-Yno-adapted-args",
         "-Ywarn-dead-code") ++ (scalaBinaryVersion.value match {
         case "2.10" => Seq.empty
-        case v      => Seq("-Ywarn-unused-import")
+        case v      => Seq("-target:jvm-1.8", "-Ywarn-unused-import")
       }),
       libraryDependencies ++= Seq(
         "org.scalatest" %% "scalatest" % "3.0.1" % Test,