From 65e58ae86efe62d2b6f14cdc075183aed81ea906 Mon Sep 17 00:00:00 2001 From: Javi Pacheco Date: Tue, 19 Apr 2016 13:38:00 +0200 Subject: [PATCH 1/4] =all: Prepares for Sonatype releases --- .gitignore | 3 +++ .travis.yml | 13 ++++++++- README.md | 25 +++++++++++++++-- build.sbt | 64 +++++++++++++++++++++++++++++++++++++++++--- project/plugins.sbt | 6 ++--- rings.tar.enc | Bin 0 -> 10256 bytes 6 files changed, 101 insertions(+), 10 deletions(-) create mode 100644 rings.tar.enc diff --git a/.gitignore b/.gitignore index 9f4d766..5d4a8fb 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,6 @@ proguard-sbt.txt # vim swap files *.sw* + +local.secring.asc +local.pubring.asc \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6cc5aad..1d60793 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,11 @@ cache: - $HOME/android-sdk_r24-linux.tgz - $HOME/android-sdk-linux +env: + global: + - secure: "IySntSISKvpQjBJetgwfrFoFDTwAl2diMTpMv8yAeeOwYkpRaO8UaeuitWpK2JNb2JrfbzfvelT+pR79kyKCNzXfzvFJ1kw0NaSqSijBQo5h8PcnqpdB8W/Rr3LLE1v6isvTIAI/hqEnwOzbPkX1jJ0Zyq8gQA5vEk1iT/xpFzQ=" + - secure: "bJzXS/Uhyrfl0Hr6FE856i0EOipG/8J12Sq/HaJdLwZ1c7Ns1eNQ1trSKN7plzRuY1ybiMgp3BHvkLDZkAaxfVNgyTl+REyMXr58ns1kIP9obTcHNxz/X2DXbILpFbngmNdf1LAvBDNVFbPaDUjUF9zUY31SUspjYE3gfflcAF0=" + - secure: "WhPCWomgfcK/zMJYc5IMN82Gb2lXhCVt0XedSCAcOCsbNW/jeUN87ZleshhIuZgf/jQ6yHJ0X0Btiy4IpayrBI0n6Zg74MMnQ802etPeuBlxqQjdoBLsj0EGMxFtKrJap3mpfpmWvy8g0Mgcvxh4f3k+CPV5GCBxWOphEm9eH8Q=" before_install: - sudo apt-get update -qq - sudo apt-get install -y libc6-i386 lib32z1 lib32stdc++6 @@ -26,4 +31,10 @@ before_install: - export ANDROID_HOME=$HOME/android-sdk-linux - export ANDROID_SDK_HOME=$HOME/android-sdk-linux - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools - +- 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 +after_success: +- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project core" "publishSnapshot" +- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project akka" "publishSnapshot" +- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project viewable" "publishSnapshot" \ No newline at end of file diff --git a/README.md b/README.md index b334e3f..9605584 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ### *Macroid* β€” a Scala GUI DSL for Android -[![Build Status](https://travis-ci.org/macroid/macroid.png?branch=master)](https://travis-ci.org/macroid/macroid) [![Codacy Badge](https://www.codacy.com/project/badge/fb3d939567d04686bfb23da3a22b9de9)](https://www.codacy.com/public/nickstanch/macroid) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Macroid-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/1529) [![Join the chat at https://gitter.im/macroid/macroid](https://img.shields.io/badge/GITTER-Join%20chat%20β†’-brightgreen.svg?style=flat)](https://gitter.im/macroid/macroid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) +[![Build Status](https://travis-ci.org/47deg/macroid.png?branch=master)](https://travis-ci.org/47deg/macroid) [![Codacy Badge](https://www.codacy.com/project/badge/fb3d939567d04686bfb23da3a22b9de9)](https://www.codacy.com/public/nickstanch/macroid) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-Macroid-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/1529) [![Join the chat at https://gitter.im/macroid/macroid](https://img.shields.io/badge/GITTER-Join%20chat%20β†’-brightgreen.svg?style=flat)](https://gitter.im/macroid/macroid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) *Macroid* is the most badass modular functional user interface creation language for Android, implemented with Scala macros. [Some people say](http://www.urbandictionary.com/define.php?term=macroid) it’s also a dead noodle. @@ -9,7 +9,7 @@ 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-M4` ([installation](http://macroid.github.io/Installation.html) | [changelog](http://macroid.github.io/Changelog.html)). +Latest version: `2.0.0-M5` License: [MIT](http://opensource.org/licenses/MIT). @@ -20,6 +20,27 @@ License: [MIT](http://opensource.org/licenses/MIT). For more info head to http://macroid.github.io! +#### Installation + +```scala + +libraryDependencies ++= Seq( + aar("org.macroid" %% "macroid" % "2.0.0-M5") + +``` + +If you want to use the SNAPSHOT version you need to add the Sonatype SNAPSHOT repo + +```scala + +resolvers += + "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" + +libraryDependencies ++= Seq( + aar("org.macroid" %% "macroid" % "2.0.0-M6-SNAPSHOT") + +``` + #### Contributing All contributions are welcome (and encouraged)! diff --git a/build.sbt b/build.sbt index 3e92678..c32d9c5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,12 +1,17 @@ import com.typesafe.sbt.SbtScalariform.ScalariformKeys +import sbt.Keys._ import scalariform.formatter.preferences._ -val commonSettings = androidBuildAar ++ bintrayPublishSettings ++ Seq( + +lazy val gpgFolder = sys.env.getOrElse("GPG_FOLDER", ".") + +lazy val publishSnapshot = taskKey[Unit]("Publish only if the version is a SNAPSHOT") + +val commonSettings = androidBuildAar ++ Seq( platformTarget in Android := "android-23", typedResources := false, - organization := "org.macroid", - version := "2.0.0-M4", + version := "2.0.0-M6-SNAPSHOT", licenses += ("MIT", url("http://opensource.org/licenses/MIT")), scalaVersion := "2.11.7", @@ -41,7 +46,58 @@ val commonSettings = androidBuildAar ++ bintrayPublishSettings ++ Seq( .setPreference(PlaceScaladocAsterisksBeneathSecondAsterisk, true) .setPreference(DoubleIndentClassDeclaration, false) .setPreference(MultilineScaladocCommentsStartOnFirstLine, true) - .setPreference(RewriteArrowSymbols, true) + .setPreference(RewriteArrowSymbols, true), + + organization := "org.macroid", + + organizationName := "macroid", + + organizationHomepage := Some(new URL("http://macroid.github.io")), + + publishMavenStyle := true, + + startYear := Some(2015), + + description := "A Scala GUI DSL for Android", + + homepage := Some(url("http://macroid.github.io")), + + scmInfo := Some(ScmInfo(url("https://github.com/47deg/macroid"), "https://github.com/47deg/macroid.git")), + + pomExtra := + + + macroid + + , + + publishTo := { + val nexus = "https://oss.sonatype.org/" + if (isSnapshot.value) + Some("snapshots" at nexus + "content/repositories/snapshots") + else + Some("releases" at nexus + "service/local/staging/deploy/maven2") + }, + + pgpPassphrase := Some(sys.env.getOrElse("GPG_PASSPHRASE", "").toCharArray), + + pgpPublicRing := file(s"$gpgFolder/local.pubring.asc"), + + pgpSecretRing := file(s"$gpgFolder/local.secring.asc"), + + credentials += Credentials("Sonatype Nexus Repository Manager", + "oss.sonatype.org", + sys.env.getOrElse("PUBLISH_USERNAME", ""), + sys.env.getOrElse("PUBLISH_PASSWORD", "")), + + publishArtifact in Test := false, + + publishSnapshot := Def.taskDyn { + if (isSnapshot.value) Def.task { PgpKeys.publishSigned.value } + else Def.task(println("Actual version is not a Snapshot. Skipping publish.")) + }.value + + ) ++ addCommandAlias("testAndCover", "; clean; coverage; test; coverageReport; coverageAggregate") val paradiseVersion = "2.1.0" diff --git a/project/plugins.sbt b/project/plugins.sbt index a2ed132..90edae9 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,8 @@ -addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.16") - -addSbtPlugin("me.lessis" % "bintray-sbt" % "0.2.1") +addSbtPlugin("com.hanhuy.sbt" % "android-sdk-plugin" % "1.5.19") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.3.5") addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") + diff --git a/rings.tar.enc b/rings.tar.enc new file mode 100644 index 0000000000000000000000000000000000000000..2ab3c2880e2f49291778d88534481445508f39b2 GIT binary patch literal 10256 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 Date: Tue, 19 Apr 2016 13:45:48 +0200 Subject: [PATCH 2/4] Fixes travis file --- .travis.yml | 23 ++++++++++++++++++----- project/prepare-build.sh | 20 -------------------- 2 files changed, 18 insertions(+), 25 deletions(-) delete mode 100644 project/prepare-build.sh diff --git a/.travis.yml b/.travis.yml index 1d60793..bc12b0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,15 @@ +sudo: false language: scala scala: - 2.10.5 - 2.11.7 +addons: + apt: + packages: + - libc6-i386 + - lib32z1 + - lib32stdc++6 before_cache: - du -h -d 1 $HOME/.ivy2/cache @@ -25,15 +32,21 @@ env: - secure: "bJzXS/Uhyrfl0Hr6FE856i0EOipG/8J12Sq/HaJdLwZ1c7Ns1eNQ1trSKN7plzRuY1ybiMgp3BHvkLDZkAaxfVNgyTl+REyMXr58ns1kIP9obTcHNxz/X2DXbILpFbngmNdf1LAvBDNVFbPaDUjUF9zUY31SUspjYE3gfflcAF0=" - secure: "WhPCWomgfcK/zMJYc5IMN82Gb2lXhCVt0XedSCAcOCsbNW/jeUN87ZleshhIuZgf/jQ6yHJ0X0Btiy4IpayrBI0n6Zg74MMnQ802etPeuBlxqQjdoBLsj0EGMxFtKrJap3mpfpmWvy8g0Mgcvxh4f3k+CPV5GCBxWOphEm9eH8Q=" before_install: -- sudo apt-get update -qq -- sudo apt-get install -y libc6-i386 lib32z1 lib32stdc++6 -- bash project/prepare-build.sh -- export ANDROID_HOME=$HOME/android-sdk-linux -- export ANDROID_SDK_HOME=$HOME/android-sdk-linux +- 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-23.0.1 --no-ui +- echo yes | android update sdk --all --filter android-23 --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 +script: + - sbt ++$TRAVIS_SCALA_VERSION clean test after_success: - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project core" "publishSnapshot" - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project akka" "publishSnapshot" diff --git a/project/prepare-build.sh b/project/prepare-build.sh deleted file mode 100644 index 4c5bc5d..0000000 --- a/project/prepare-build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -set -eu - -# caching based on tar file name to allow easy upgrading when version changes -if [[ ! -f $HOME/android-sdk_r24-linux.tgz || ! -d $HOME/android-sdk-linux ]]; then - curl http://dl.google.com/android/android-sdk_r24-linux.tgz > $HOME/android-sdk_r24-linux.tgz - tar xf $HOME/android-sdk_r24-linux.tgz -C $HOME -fi - -export ANDROID_HOME=$HOME/android-sdk-linux -export ANDROID_SDK_HOME=$HOME/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 extra-android-support --no-ui -echo "yes" | android update sdk --all --filter extra-android-m2repository --no-ui - From c6ab49f6f4a85e9888eb2ed5bcd59e97d9fc7e47 Mon Sep 17 00:00:00 2001 From: Javi Pacheco Date: Tue, 19 Apr 2016 14:40:16 +0200 Subject: [PATCH 3/4] Create automatically snapshot in master --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index bc12b0a..3381a65 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,6 +48,6 @@ before_install: script: - sbt ++$TRAVIS_SCALA_VERSION clean test after_success: -- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project core" "publishSnapshot" -- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project akka" "publishSnapshot" -- test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "=all-upgrade-for-sonatype-version" && sbt ++$TRAVIS_SCALA_VERSION "project viewable" "publishSnapshot" \ No newline at end of file +- 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" \ No newline at end of file From de10fc774d9a523b70d9b02d254c65db1f532fa2 Mon Sep 17 00:00:00 2001 From: Javi Pacheco Date: Tue, 19 Apr 2016 16:38:48 +0200 Subject: [PATCH 4/4] 2.0.0-M5 version --- README.md | 12 ------------ build.sbt | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/README.md b/README.md index 9605584..18b500a 100644 --- a/README.md +++ b/README.md @@ -29,18 +29,6 @@ libraryDependencies ++= Seq( ``` -If you want to use the SNAPSHOT version you need to add the Sonatype SNAPSHOT repo - -```scala - -resolvers += - "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" - -libraryDependencies ++= Seq( - aar("org.macroid" %% "macroid" % "2.0.0-M6-SNAPSHOT") - -``` - #### Contributing All contributions are welcome (and encouraged)! diff --git a/build.sbt b/build.sbt index c32d9c5..da72e2c 100644 --- a/build.sbt +++ b/build.sbt @@ -11,7 +11,7 @@ val commonSettings = androidBuildAar ++ Seq( platformTarget in Android := "android-23", typedResources := false, - version := "2.0.0-M6-SNAPSHOT", + version := "2.0.0-M5", licenses += ("MIT", url("http://opensource.org/licenses/MIT")), scalaVersion := "2.11.7",