Merge branch 'beta'

Author: Josh Deffibaugh

.travis.yml

@@ -23,4 +23,4 @@ before_script:
   - adb shell input keyevent 82 &
 script:
   - ./gradlew testAllModules
-  - if [[ ( "$TRAVIS_BRANCH" == "beta"  || "$TRAVIS_BRANCH" == "master" ) && ( -z "$TRAVIS_TAG") ]]; then ./gradlew ship; fi
+  - if [[ ( "$TRAVIS_BRANCH" == "beta"  || "$TRAVIS_BRANCH" == "master" ) && ( -n "$TRAVIS_TAG") ]]; then ./gradlew ship; fi

README.md

@@ -1,12 +1,12 @@
 # optimizely-ab-android-sdk
 Master<br/> 
-[![Master Status](https://travis-ci.com/optimizely/android-sdk.svg?token=gwpzBrYRAoACxHs4ThQT&branch=master)](https://travis-ci.com/optimizely/android-sdk)
+[![Master Status](https://travis-ci.org/optimizely/android-sdk.svg?branch=master)](https://travis-ci.org/optimizely/android-sdk)
 <br/>
 Beta<br/>
-[![Beta Status](https://travis-ci.com/optimizely/android-sdk.svg?token=gwpzBrYRAoACxHs4ThQT&branch=beta)](https://travis-ci.com/optimizely/android-sdk)
+[![Beta Status](https://travis-ci.org/optimizely/android-sdk.svg?branch=beta)](https://travis-ci.org/optimizely/android-sdk)
 <br/>
 Devel<br/> 
-[![Devel Status](https://travis-ci.com/optimizely/android-sdk.svg?token=gwpzBrYRAoACxHs4ThQT&branch=devel)](https://travis-ci.com/optimizely/android-sdk)
+[![Devel Status](https://travis-ci.org/optimizely/android-sdk.svg?branch=devel)](https://travis-ci.org/optimizely/android-sdk)
 <br/>
 <br/>
 [![Apache 2.0](https://img.shields.io/github/license/nebula-plugins/gradle-extra-configurations-plugin.svg)](http://www.apache.org/licenses/LICENSE-2.0)
@@ -16,6 +16,8 @@ Our Optimizely X Android solution allows you to easily run experiments anywhere
 
 To find out more check out the [documentation](https://developers.optimizely.com/x/solutions/sdks/introduction/index.html?language=android&platform=mobile). 
 
+This repo depends on [Optimizely X Java](https://github.com/optimizely/java-sdk).
+
 ## Architecture
 
 This project has 5 modules. Each module has source in `<module>/src/main/java`
@@ -78,13 +80,18 @@ Tests can be run by right clicking the file in the project pane or by clicking t
 
 ## Releasing
 
-The default branch is devel.  Feature branch PRs are automatically made against it. When PRs are reviewed and pass checks they should be squashed and merged into devel.  The version of the SDK in devel should always be the version of the next release plus `-SNAPSHOT`.  
+The default branch is devel.  Feature branch PRs are automatically made against it. When PRs are reviewed and pass checks they should be squashed and merged into devel.  Devel will be built and tested for each commit.
 
-If a beta, or snapshot, build needs to be published simply checkout beta and merge devel.  The beta branch should fast forward.  Push devel and Travis will start.  If the tests pass the build will be sent to our Maven repos on Bintray.  
+Versions are managed via git tags.  Tags can be created from the command line or from the Github UI.
 
-When a release version needs to be published checkout the master branch and merge devel.  The master branch should be fast forwarded.  Remove the `-SNAPSHOT` from the version in `build.gradle` and commit directly onto master. Push master and if the tests pass Travis will publish the version to our Maven repos on Bintray.  if the version already exists on Bintray the upload will be rejected.  The commit that updates the version should also be tagged with the version number.
+Snapshot builds are made off of the beta branch.  Travis will test all commits to this branch.  When commit is tagged and pushed travis will build, test, *and*, ship the build bintray.  The version name used
+is the name of the tag.  For snapshot builds the version should have `-SNAPSHOT` appended.  For example `0.1.2-SNAPSHOT`.  Multiple builds with the same version can be pushed to Bintray when using snapshot versions.
+This keeps the version number from increasing too quickly for beta builds.  Grade and maven ensure that users are on the latest snapshot via timestamps.
+There can be only one git tag per version name so snapshot tags may need to be moved.  For example `git tag -f -a 0.1.2` and `git push -f --tags`.  
 
-Once the next release has been published from the master branch the snapshot version in devel should be bumped to the next targeted version.
+Release builds are made off of the master branch.  Travis will test all commits to this branch.  Just like the beta branch, pushing a tag will trigger a build, tests, and release of the version of the tag to Bintray.
+For example, to release version 0.1.2 you need to pull devel, checkout master, pull master, fast-forward master to devel, push master, then release 0.1.2 on Github, which creates a tag.  You could also run 
+`git tag -a 0.1.2 -m 'Version 0.1.2`.  The argument to `-a` is the actual version name used on Bintray so it must be exact.  Then run `git push --tags` to trigger Travis.
 
 *Note:* only Optimizely employees can push to master, beta, and devel branches.
 

build.gradle

@@ -17,14 +17,17 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    def bintrayUser = System.getenv('BINTRAY_USER')
-    def bintrayApiKey = System.getenv('BINTRAY_API_KEY')
-    if (bintrayUser != null && bintrayApiKey != null) {
-        rootProject.ext.bintray_user = bintrayUser
-        rootProject.ext.bintray_api_key = bintrayApiKey
+    def bintray_user = System.getenv('BINTRAY_USER')
+    def bintray_api_key = System.getenv('BINTRAY_API_KEY')
+    def version_name = System.getenv('TRAVIS_TAG')
+    if (bintray_user != null && bintray_api_key != null && version_name != null) {
+        rootProject.ext.bintray_user = bintray_user
+        rootProject.ext.bintray_api_key = bintray_api_key
+        rootProject.ext.version_name = version_name
     } else {
         rootProject.ext.bintray_user = ''
         rootProject.ext.bintray_api_key = ''
+        rootProject.ext.version_name= ''
     }
     repositories {
         jcenter()
@@ -80,5 +83,4 @@ task testAllModules << {
 
 testAllModules.dependsOn(':android-sdk:connectedAndroidTest', ':android-sdk:test',
         ':event-handler:connectedAndroidTest', ':event-handler:test',
-        ':user-experiment-record:connectedAndroidTest', ':shared:connectedAndroidTest',
-        ':test-app:connectedAndroidTest')
+        ':user-experiment-record:connectedAndroidTest', ':shared:connectedAndroidTest')

test-app/src/androidTest/java/com/optimizely/ab/android/test_app/MainActivityEspressoTest.java

@@ -25,6 +25,7 @@
 import android.support.test.rule.ActivityTestRule;
 import android.support.test.runner.AndroidJUnit4;
 import android.util.Pair;
+import android.view.WindowManager;
 
 import com.optimizely.ab.android.event_handler.EventIntentService;
 import com.optimizely.ab.android.sdk.DataFileService;
@@ -122,7 +123,26 @@ protected void after() {
                     CountingIdlingResourceManager.clearEvents();
                 }
             })
-            .around(activityTestRule);
+            .around(activityTestRule)
+            .around(new ExternalResource() {
+                @Override
+                protected void before() throws Throwable {
+                    super.before();
+                    Runnable wakeUpDevice = new Runnable() {
+                        public void run() {
+                            activityTestRule.getActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON |
+                                    WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
+                                    WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+                        }
+                    };
+                    activityTestRule.getActivity().runOnUiThread(wakeUpDevice);
+                }
+
+                @Override
+                protected void after() {
+                    super.after();
+                }
+            });
 
     @Test
     public void experimentActivationForWhitelistUser() throws InterruptedException {

test-app/src/main/AndroidManifest.xml

@@ -2,6 +2,9 @@
 <manifest package="com.optimizely.ab.android.test_app"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+
     <application
         android:name=".MyApplication"
         android:allowBackup="false"