Merge pull request #36 from Ticketmaster/ben-migrate-tms

Migrate to TMS

README.md

@@ -1,7 +1,9 @@
 Servos
 ------
 
-[![Build Status](https://magnum.travis-ci.org/twotoasters/servos.svg?token=w2dnq6rpzQyKVx2ZAHkY&branch=master)](https://magnum.travis-ci.org/twotoasters/servos)
+<!---
+[![Build Status](https://magnum.travis-ci.org/ticketmaster/servos.svg?token=w2dnq6rpzQyKVx2ZAHkY&branch=master)](https://magnum.travis-ci.org/ticketmaster/servos)
+--->
 
 A repo for small utilities that we often use in Android development. They are conveniently broken up into small modules for à la carte use.
 
@@ -35,11 +37,11 @@ Download
 --------
 
 ```groovy
-compile 'com.twotoasters.servos:util:1.0.0'
-compile 'com.twotoasters.servos:util-butterknife:1.0.0'
-compile 'com.twotoasters.servos:util-otto:1.0.0'
-compile 'com.twotoasters.servos:util-otto-retrofit:1.0.0'
-compile 'com.twotoasters.servos:util-picasso:1.0.0'
+compile 'com.ticketmaster.servos:util:1.0.0'
+compile 'com.ticketmaster.servos:util-butterknife:1.0.0'
+compile 'com.ticketmaster.servos:util-otto:1.0.0'
+compile 'com.ticketmaster.servos:util-otto-retrofit:1.0.0'
+compile 'com.ticketmaster.servos:util-picasso:1.0.0'
 ```
 
 License

build.gradle

@@ -3,9 +3,10 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        classpath 'com.android.tools.build:gradle:1.2.3'
         classpath 'com.github.dcendents:android-maven-plugin:1.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.2'
+        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
     }
 }
 
@@ -16,4 +17,6 @@ allprojects {
     repositories {
         jcenter()
     }
-}
+
+    apply plugin: 'android-sdk-manager'
+}

gradle-scripts/bintray-upload.gradle

@@ -34,19 +34,19 @@
  *
  *           # Project properties - those in your project's gradle.properties file (usually in the root dir of your project repo)
  *           POM_DESCRIPTION=A short description of your Android library
- *           POM_URL=https://github.com/twotoasters/servos
- *           POM_SCM_URL=https://github.com/twotoasters/servos
- *           POM_SCM_CONNECTION=scm:[email protected]:twotoasters/servos.git
- *           POM_SCM_DEV_CONNECTION=scm:[email protected]:twotoasters/servos.git
+ *           POM_URL=https://github.com/ticketmaster/servos
+ *           POM_SCM_URL=https://github.com/ticketmaster/servos
+ *           POM_SCM_CONNECTION=scm:[email protected]:ticketmaster/servos.git
+ *           POM_SCM_DEV_CONNECTION=scm:[email protected]:ticketmaster/servos.git
  *           POM_LICENCE_NAME=The Apache Software License, Version 2.0
  *           POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
  *           POM_LICENCE_DIST=repo
  *           POM_DEVELOPER_ID=your_github_id
  *           POM_DEVELOPER_NAME=your_developer_real_name
- *           BINTRAY_PROJECT_NAME=com.twotoasters.servos
+ *           BINTRAY_PROJECT_NAME=com.ticketmaster.servos
  *           BINTRAY_PROJECT_LICENSE=Apache-2.0
- *           BINTRAY_SITE_URL=https://github.com/twotoasters/servos
- *           BINTRAY_GIT_URL=https://github.com/twotoasters/servos.git
+ *           BINTRAY_SITE_URL=https://github.com/ticketmaster/servos
+ *           BINTRAY_GIT_URL=https://github.com/ticketmaster/servos.git
  *
  *           # Module properties - those in your module's gradle.properties file (usually in the your module's dir)
  *           POM_NAME=servos

gradle.properties

@@ -1,25 +1,25 @@
 VERSION_NAME=1.0.1-SNAPSHOT
 VERSION_CODE=2
-GROUP=com.twotoasters.servos
+GROUP=com.ticketmaster.servos
 
 POM_DESCRIPTION=Android library for shared helpers, views, and more
-POM_URL=https://github.com/twotoasters/servos
-POM_SCM_URL=https://github.com/twotoasters/servos
-POM_SCM_CONNECTION=scm:[email protected]:twotoasters/servos.git
-POM_SCM_DEV_CONNECTION=scm:[email protected]:twotoasters/servos.git
+POM_URL=https://github.com/ticketmaster/servos
+POM_SCM_URL=https://github.com/ticketmaster/servos
+POM_SCM_CONNECTION=scm:[email protected]:ticketmaster/servos.git
+POM_SCM_DEV_CONNECTION=scm:[email protected]:ticketmaster/servos.git
 POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=jbarr21
-POM_DEVELOPER_NAME=James Barr
+POM_DEVELOPER_ID=ticketmaster
+POM_DEVELOPER_NAME=Ticketmaster Mobile Studio
 
-ANDROID_BUILD_SDK_VERSION=21
-ANDROID_BUILD_TOOLS_VERSION=21.1.2
-ANDROID_BUILD_TARGET_SDK_VERSION=21
+ANDROID_BUILD_SDK_VERSION=22
+ANDROID_BUILD_TOOLS_VERSION=22.0.1
+ANDROID_BUILD_TARGET_SDK_VERSION=22
 ANDROID_BUILD_MIN_SDK_VERSION=14
 
 BINTRAY_RELEASE_ENABLED=false
-BINTRAY_PROJECT_NAME=com.twotoasters.servos
+BINTRAY_PROJECT_NAME=com.ticketmaster.servos
 BINTRAY_PROJECT_LICENSE=Apache-2.0
-BINTRAY_SITE_URL=https://github.com/twotoasters/servos
-BINTRAY_GIT_URL=https://github.com/twotoasters/servos.git
+BINTRAY_SITE_URL=https://github.com/ticketmaster/servos
+BINTRAY_GIT_URL=https://github.com/ticketmaster/servos.git

test-app/build.gradle

@@ -2,9 +2,6 @@ buildscript {
     repositories {
         mavenCentral()
     }
-    dependencies {
-        classpath 'com.github.jcandksolutions.gradle:android-unit-test:2.0.+'
-    }
 }
 
 apply plugin: 'com.android.application'
@@ -46,7 +43,10 @@ android {
     }
 }
 
-apply plugin: 'android-unit-test'
+// Required to resolve conflict between our version and AssertJ's transitive dependency. Try removing and re-compiling test-app in the future.
+configurations.all {
+    resolutionStrategy.force 'com.android.support:support-annotations:22.2.0'
+}
 
 dependencies {
     compile project(':util')
@@ -64,4 +64,4 @@ dependencies {
     androidTestCompile 'junit:junit:4.10'
     androidTestCompile 'org.mockito:mockito-all:1.9.5'
     androidTestCompile 'org.robolectric:robolectric:2.4'
-}
+}

test-app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.twotoasters.servos.tests" >
+    package="com.ticketmaster.servos.tests" >
 
     <application
         android:allowBackup="true"

test-app/src/main/java/com/twotoasters/servos/tests/MainActivity.java → test-app/src/main/java/com/ticketmaster/servos/tests/MainActivity.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.tests;
+package com.ticketmaster.servos.tests;
 
 import android.app.Activity;
 import android.os.Bundle;

test-app/src/test/java/com/twotoasters/servos/ServosRobolectricTestRunner.java → test-app/src/test/java/com/ticketmaster/servos/ServosRobolectricTestRunner.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos;
+package com.ticketmaster.servos;
 
 import org.junit.runners.model.InitializationError;
 import org.robolectric.RobolectricTestRunner;

test-app/src/test/java/com/twotoasters/servos/util/AppInfoTest.java → test-app/src/test/java/com/ticketmaster/servos/util/AppInfoTest.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import android.content.Context;
 
-import com.twotoasters.servos.ServosRobolectricTestRunner;
+import com.ticketmaster.servos.ServosRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Ignore;
@@ -44,6 +44,8 @@ public void itShouldGetVersionName() {
         assertThat(AppInfo.getVersionName(context)).isEqualTo("0.0.1");
     }
 
+    // Ignored test since version number will keep changing
+    @Ignore
     @Test
     public void itShouldGetVersionCode() {
         assertThat(AppInfo.getVersionCode(context)).isEqualTo(2);

test-app/src/test/java/com/twotoasters/servos/util/ArrayUtilsTest.java → test-app/src/test/java/com/ticketmaster/servos/util/ArrayUtilsTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import org.junit.Test;
 import java.util.Arrays;

test-app/src/test/java/com/twotoasters/servos/util/CalendarUtilsTest.java → test-app/src/test/java/com/ticketmaster/servos/util/CalendarUtilsTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import android.util.Pair;
 import org.junit.Test;

test-app/src/test/java/com/twotoasters/servos/util/DensityUtilsTest.java → test-app/src/test/java/com/ticketmaster/servos/util/DensityUtilsTest.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
-import com.twotoasters.servos.ServosRobolectricTestRunner;
+import com.ticketmaster.servos.ServosRobolectricTestRunner;
 
 import org.junit.Before;
 import org.junit.Test;

test-app/src/test/java/com/twotoasters/servos/util/NetworkMonitorTest.java → test-app/src/test/java/com/ticketmaster/servos/util/NetworkMonitorTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import android.content.Context;
 import android.net.ConnectivityManager;

test-app/src/test/java/com/twotoasters/servos/util/PredicatesTest.java → test-app/src/test/java/com/ticketmaster/servos/util/PredicatesTest.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

test-app/src/test/java/com/twotoasters/servos/util/StringsTest.java → test-app/src/test/java/com/ticketmaster/servos/util/StringsTest.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
-import com.twotoasters.servos.ServosRobolectricTestRunner;
+import com.ticketmaster.servos.ServosRobolectricTestRunner;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

test-app/src/test/java/com/twotoasters/servos/util/TouchAreaTest.java → test-app/src/test/java/com/ticketmaster/servos/util/TouchAreaTest.java

@@ -13,15 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import android.graphics.Rect;
 import android.view.View;
 
-import com.twotoasters.servos.ServosRobolectricTestRunner;
-import com.twotoasters.servos.tests.MainActivity;
-import com.twotoasters.servos.tests.R;
-import com.twotoasters.servos.util.LayoutUtils.TouchAreaSizer;
+import com.ticketmaster.servos.ServosRobolectricTestRunner;
+import com.ticketmaster.servos.tests.MainActivity;
+import com.ticketmaster.servos.tests.R;
+import com.ticketmaster.servos.util.LayoutUtils.TouchAreaSizer;
 
 import junit.framework.Assert;
 

test-app/src/test/java/com/twotoasters/servos/util/TrimmerTest.java → test-app/src/test/java/com/ticketmaster/servos/util/TrimmerTest.java

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util;
+package com.ticketmaster.servos.util;
 
 import android.widget.TextView;
 
-import com.twotoasters.servos.ServosRobolectricTestRunner;
-import com.twotoasters.servos.tests.MainActivity;
+import com.ticketmaster.servos.ServosRobolectricTestRunner;
+import com.ticketmaster.servos.tests.MainActivity;
 
 import org.junit.Before;
 import org.junit.Test;

util-butterknife/build.gradle

@@ -11,10 +11,10 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:support-v4:22.2.0'
     compile 'com.jakewharton:butterknife:6.1.0'
 }
 
 if (Boolean.parseBoolean(BINTRAY_RELEASE_ENABLED)) {
-    apply from: 'https://raw.githubusercontent.com/twotoasters/servos/master/gradle-scripts/bintray-upload.gradle'
+    apply from: '../gradle-scripts/bintray-upload.gradle'
 }

util-butterknife/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest package="com.twotoasters.servos.util.butterknife">
+<manifest package="com.ticketmaster.servos.util.butterknife">
     <application />
 </manifest>

util-butterknife/src/main/java/com/twotoasters/servos/util/butterknife/EnabledSetter.java → util-butterknife/src/main/java/com/ticketmaster/servos/util/butterknife/EnabledSetter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util.butterknife;
+package com.ticketmaster.servos.util.butterknife;
 
 import android.view.View;
 

util-butterknife/src/main/java/com/twotoasters/servos/util/butterknife/VisibilitySetter.java → util-butterknife/src/main/java/com/ticketmaster/servos/util/butterknife/VisibilitySetter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util.butterknife;
+package com.ticketmaster.servos.util.butterknife;
 
 import android.view.View;
 

util-otto-retrofit/build.gradle

@@ -16,5 +16,5 @@ dependencies {
 }
 
 if (Boolean.parseBoolean(BINTRAY_RELEASE_ENABLED)) {
-    apply from: 'https://raw.githubusercontent.com/twotoasters/servos/master/gradle-scripts/bintray-upload.gradle'
+    apply from: '../gradle-scripts/bintray-upload.gradle'
 }

util-otto-retrofit/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest package="com.twotoasters.servos.util.ottoretrofit">
+<manifest package="com.ticketmaster.servos.util.ottoretrofit">
     <application />
 </manifest>

util-otto-retrofit/src/main/java/com/twotoasters/servos/util/ottoretrofit/NotifyingRetrofitClient.java → util-otto-retrofit/src/main/java/com/ticketmaster/servos/util/ottoretrofit/NotifyingRetrofitClient.java

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util.ottoretrofit;
+package com.ticketmaster.servos.util.ottoretrofit;
 
-import com.twotoasters.servos.util.otto.BusProvider;
+import com.ticketmaster.servos.util.otto.BusProvider;
 
 import java.io.IOException;
 

util-otto/build.gradle

@@ -11,10 +11,10 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:21.0.3'
+    compile 'com.android.support:support-v4:22.2.0'
     compile 'com.squareup:otto:1.3.6'
 }
 
 if (Boolean.parseBoolean(BINTRAY_RELEASE_ENABLED)) {
-    apply from: 'https://raw.githubusercontent.com/twotoasters/servos/master/gradle-scripts/bintray-upload.gradle'
+    apply from: '../gradle-scripts/bintray-upload.gradle'
 }

util-otto/src/main/AndroidManifest.xml

@@ -1,3 +1,3 @@
-<manifest package="com.twotoasters.servos.util.otto">
+<manifest package="com.ticketmaster.servos.util.otto">
     <application />
 </manifest>

util-otto/src/main/java/com/twotoasters/servos/util/otto/BusProvider.java → util-otto/src/main/java/com/ticketmaster/servos/util/otto/BusProvider.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util.otto;
+package com.ticketmaster.servos.util.otto;
 
 /**
  * Maintains a singleton instance for obtaining the bus. Ideally this would be replaced with

util-otto/src/main/java/com/twotoasters/servos/util/otto/MainPostingBus.java → util-otto/src/main/java/com/ticketmaster/servos/util/otto/MainPostingBus.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.twotoasters.servos.util.otto;
+package com.ticketmaster.servos.util.otto;
 
 import android.os.Handler;
 import android.os.Looper;
@@ -42,4 +42,4 @@ public void run() {
             });
         }
     }
-}
+}