diff --git a/.travis.yml b/.travis.yml index f0dd2e5..9409ff8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ sudo: false language: scala - +jdk: + - oraclejdk8 scala: - 2.10.5 - 2.11.7 @@ -38,8 +39,8 @@ before_install: - 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-23.0.1 --no-ui -- echo yes | android update sdk --all --filter android-23 --no-ui +- echo yes | android update sdk --all --filter build-tools-25.0.0 --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 diff --git a/README.md b/README.md index 8078079..ee38795 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,9 @@ Striving to be focused on one thing (GUI), *Macroid* promotes composability and Prerequisites: Scala `2.10.x` or `2.11.x`, Android `API 9+`. -Latest version: `2.0.0-M5` +Latest version: `2.0` -Snapshot version: `2.0-SNAPSHOT` +Snapshot version: `2.0.1-SNAPSHOT` License: [MIT](http://opensource.org/licenses/MIT). @@ -27,7 +27,7 @@ For more info head to http://macroid.github.io! ```scala libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0.0-M5") + aar("org.macroid" %% "macroid" % "2.0") ``` @@ -39,7 +39,7 @@ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0-SNAPSHOT") + aar("org.macroid" %% "macroid" % "2.0.1-SNAPSHOT") ``` diff --git a/build.sbt b/build.sbt index 2665e40..568bffb 100644 --- a/build.sbt +++ b/build.sbt @@ -26,13 +26,13 @@ lazy val micrositeSettings = Seq( "white-color" -> "#FFFFFF") ) -val androidV = "24.2.0" +val androidV = "25.0.1" val commonSettings = androidBuildAar ++ Seq( - platformTarget in Android := "android-23", + platformTarget in Android := "android-24", typedResources := false, - version := "2.0-SNAPSHOT", + version := "2.0", licenses += ("MIT", url("http://opensource.org/licenses/MIT")), scalaVersion := "2.11.7", diff --git a/macroid-docs/src/main/tut/docs/Changelog.md b/macroid-docs/src/main/tut/docs/Changelog.md index 68f33ac..f36b2af 100644 --- a/macroid-docs/src/main/tut/docs/Changelog.md +++ b/macroid-docs/src/main/tut/docs/Changelog.md @@ -8,6 +8,11 @@ section: docs Breaking changes are in bold. +## Version `2.0` + +* Added new `macroid-extras` module +* Added documentation using `sbt-microsite` + ## Version `2.0.0-M4` Detailed diff can be found [on GitHub](https://github.com/macroid/macroid/compare/v2.0.0-M3...v2.0.0-M4). diff --git a/macroid-docs/src/main/tut/docs/Installation.md b/macroid-docs/src/main/tut/docs/Installation.md index 6235b4a..1b5109b 100644 --- a/macroid-docs/src/main/tut/docs/Installation.md +++ b/macroid-docs/src/main/tut/docs/Installation.md @@ -15,7 +15,7 @@ version `1.2.20` and above, you can add it to your project like this: ```scala libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0.0-M5") + aar("org.macroid" %% "macroid" % "2.0") ``` If you want to use the SNAPSHOT version you need to add the Sonatype SNAPSHOT repo @@ -25,7 +25,7 @@ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0-SNAPSHOT") + aar("org.macroid" %% "macroid" % "2.0.1-SNAPSHOT") ``` ## Version `2.0.0-M2` and below diff --git a/macroid-docs/src/main/tut/index.md b/macroid-docs/src/main/tut/index.md index 90ebfb9..be7d89c 100644 --- a/macroid-docs/src/main/tut/index.md +++ b/macroid-docs/src/main/tut/index.md @@ -19,7 +19,7 @@ Prerequisites: Scala `2.10.x` or `2.11.x`, Android `API 9+`. # Installation -## Version `2.0.0-M5` +## Version `2.0` *Macroid* is packaged in the AAR format and published to [Maven Central](http://central.maven.org/maven2/org/macroid/macroid_2.11/2.0.0-M5/). @@ -28,7 +28,7 @@ version `1.2.20` and above, you can add it to your project like this: ```scala libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0.0-M5") + aar("org.macroid" %% "macroid" % "2.0") ``` If you want to use the SNAPSHOT version you need to add the Sonatype SNAPSHOT repo @@ -38,5 +38,5 @@ resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0-SNAPSHOT") + aar("org.macroid" %% "macroid" % "2.0.1-SNAPSHOT") ``` diff --git a/macroid-extras/src/main/scala/macroid/extras/EditTextTweaks.scala b/macroid-extras/src/main/scala/macroid/extras/EditTextTweaks.scala index c995aee..b878d81 100644 --- a/macroid-extras/src/main/scala/macroid/extras/EditTextTweaks.scala +++ b/macroid-extras/src/main/scala/macroid/extras/EditTextTweaks.scala @@ -1,11 +1,11 @@ package macroid.extras import android.content.Context -import android.text.{Editable, InputType, TextWatcher} +import android.text.{ Editable, InputType, TextWatcher } import android.view.KeyEvent -import android.view.inputmethod.{EditorInfo, InputMethodManager} -import android.widget.{EditText, TextView} -import macroid.{ContextWrapper, Tweak} +import android.view.inputmethod.{ EditorInfo, InputMethodManager } +import android.widget.{ EditText, TextView } +import macroid.{ ContextWrapper, Tweak } object EditTextTweaks { type W = EditText diff --git a/project/plugins.sbt b/project/plugins.sbt index e0060f9..7f5b57c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.17") +addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5")