Update to Apptimize 2.12.3

RELEASING.md

@@ -1,12 +1,42 @@
 Releasing
 ========
 
- 1. Change the version in `gradle.properties` to a non-SNAPSHOT version.
- 2. Update the `CHANGELOG.md` for the impending release.
- 3. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version)
- 4. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version)
- 5. `./gradlew clean uploadArchives`
- 6. Update the `gradle.properties` to the next SNAPSHOT version.
- 7. `git commit -am "Prepare next development version."`
- 8. `git push && git push --tags`
- 9. Visit [Sonatype Nexus](https://oss.sonatype.org/) and promote the artifact.
+1. Change gradle.properties for VERSION_CODE and VERSION_NAME:
+
+		 VERSION_CODE=muupp
+		 VERSION_NAME=m.u.p
+
+		 where "m" is the major version
+						"u" is the minor version ("uu" is 2 digits with a leading zero when u is 0..9)
+						"p" is the patch level ("pp" is a 2 digits with a leading zero when p is 0..9)
+
+2. Update CHANGELOG.md for the impending release. This has the format:
+
+		 Version m.u.p (dd Mmm, yyyy)
+		 ==================================
+		 ...the change-log.txt entry from android lib/change-log.txt,
+		 ...with any internal lines removed.
+
+		 For example,
+
+		 Version 3.4.14 (18 Oct, 2019)
+		 ==================================
+		 * Remove obfuscation of Android.OnApptimizeInitializedListener
+
+3. Update build.gradle with the new build number:
+
+		 compile 'com.apptimize:apptimize-android:m.u.p@aar'
+
+4. git commit -am "Prepare for release m.u.p."
+
+5. git tag -a m.u.p -m "Version m.u.p"
+
+6. ./gradlew clean uploadArchives
+
+7. Make sure you have a github token to authenticate the push. You use a token
+   instead of your password. You can get a token by logging into github
+   and using the Settings > Developer Settings > Personal Access Tokens menu.
+
+   git push && git push --tags
+
+8. Visit [Sonatype Nexus](https://oss.sonatype.org/) and promote the artifact.

build.gradle

@@ -1,3 +1,6 @@
+// Please do not change this file
+// This file is autogenerated from build.gradle.template
+
 buildscript {
   repositories {
     mavenCentral()
@@ -14,13 +17,13 @@ apply plugin: 'checkstyle'
 apply plugin: 'com.f2prateek.checkstyle'
 
 android {
-  compileSdkVersion 23
-  buildToolsVersion '23.0.1'
+  compileSdkVersion 22
+  buildToolsVersion '23.0.3'
 
   defaultConfig {
     minSdkVersion 14
-    targetSdkVersion 23
-    compileSdkVersion 23
+    targetSdkVersion 22
+    compileSdkVersion 22
   }
 
   compileOptions {
@@ -41,7 +44,7 @@ dependencies {
 
   provided 'com.segment.analytics.android:analytics:4.0.9'
 
-  compile 'com.apptimize:apptimize-android:2.10.8'
+  compile 'com.apptimize:apptimize-android:3.12.1@aar'
 
   testCompile 'junit:junit:4.12'
   testCompile('org.robolectric:robolectric:3.0') {

build.gradle.template

@@ -0,0 +1,65 @@
+buildscript {
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath 'com.android.tools.build:gradle:1.3.1'
+    classpath 'com.f2prateek.checkstyle:checkstyle:1.0.1'
+  }
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'checkstyle'
+apply plugin: 'com.f2prateek.checkstyle'
+
+android {
+  compileSdkVersion 22
+  buildToolsVersion '23.0.3'
+
+  defaultConfig {
+    minSdkVersion 14
+    targetSdkVersion 22
+    compileSdkVersion 22
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_7
+    targetCompatibility JavaVersion.VERSION_1_7
+  }
+}
+
+checkstyle {
+  configFile rootProject.file('gradle/checkstyle.xml')
+}
+
+dependencies {
+  repositories {
+    mavenCentral()
+    maven { url 'http://maven.apptimize.com/artifactory/repo' }
+  }
+
+  provided 'com.segment.analytics.android:analytics:4.0.9'
+
+  compile 'com.apptimize:apptimize-android:${VERSION}@aar'
+
+  testCompile 'junit:junit:4.12'
+  testCompile('org.robolectric:robolectric:3.0') {
+    exclude group: 'commons-logging', module: 'commons-logging'
+    exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+  }
+
+  testCompile 'com.segment.analytics.android:analytics-tests:4.0.9'
+
+  testCompile 'org.assertj:assertj-core:1.7.1'
+
+  testCompile 'org.mockito:mockito-core:1.10.19'
+
+  testCompile 'org.powermock:powermock:1.6.2'
+  testCompile 'org.powermock:powermock-module-junit4:1.6.2'
+  testCompile 'org.powermock:powermock-module-junit4-rule:1.6.2'
+  testCompile 'org.powermock:powermock-api-mockito:1.6.2'
+  testCompile 'org.powermock:powermock-classloading-xstream:1.6.2'
+}
+
+apply from: rootProject.file('gradle/gradle-mvn-push.gradle')

gradle.properties

@@ -1,22 +1,25 @@
-GROUP=com.segment.analytics.android.integrations
+# Please do not change this file
+# This file is autogenerated from gradle.properties.template
 
-VERSION_CODE=101
-VERSION_NAME=1.0.1-SNAPSHOT
+GROUP=com.apptimize.segment
 
-POM_ARTIFACT_ID=apptimize
+VERSION_CODE=31201
+VERSION_NAME=3.12.1
+
+POM_ARTIFACT_ID=apptimize-segment-integration
 POM_PACKAGING=aar
 
-POM_NAME=Apptimize Integration
+POM_NAME=Apptimize Segment Integration
 POM_DESCRIPTION=Apptimize Integration for Segment Android Analytics
 
-POM_URL=http://github.com/segment-integrations/analytics-android-integration-apptimize
-POM_SCM_URL=http://github.com/segment-integrations/analytics-android-integration-apptimize
-POM_SCM_CONNECTION=scm:git:git://github.com/segment-integrations/analytics-android-integration-apptimize.git
-POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/segment-integrations/analytics-android-integration-apptimize.git
+POM_URL=http://github.com/Apptimize/analytics-android-integration-apptimize/
+POM_SCM_URL=https://github.com/Apptimize/analytics-android-integration-apptimize/
+POM_SCM_CONNECTION=scm:git:git://github.com/Apptimize/analytics-android-integration-apptimize.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/Apptimize/analytics-android-integration-apptimize.git
 
 POM_LICENCE_NAME=The MIT License (MIT)
 POM_LICENCE_URL=http://opensource.org/licenses/MIT
 POM_LICENCE_DIST=repo
 
-POM_DEVELOPER_ID=segmentio
-POM_DEVELOPER_NAME=Segment, Inc.
+POM_DEVELOPER_ID=apptimize
+POM_DEVELOPER_NAME=Apptimize, Inc.

gradle.properties.template

@@ -0,0 +1,22 @@
+GROUP=com.apptimize.segment
+
+VERSION_CODE=${VERSION-CODE}
+VERSION_NAME=${VERSION-NAME}
+
+POM_ARTIFACT_ID=apptimize-segment-integration
+POM_PACKAGING=aar
+
+POM_NAME=Apptimize Segment Integration
+POM_DESCRIPTION=Apptimize Integration for Segment Android Analytics
+
+POM_URL=http://github.com/Apptimize/analytics-android-integration-apptimize/
+POM_SCM_URL=https://github.com/Apptimize/analytics-android-integration-apptimize/
+POM_SCM_CONNECTION=scm:git:git://github.com/Apptimize/analytics-android-integration-apptimize.git
+POM_SCM_DEV_CONNECTION=scm:git:ssh://[email protected]/Apptimize/analytics-android-integration-apptimize.git
+
+POM_LICENCE_NAME=The MIT License (MIT)
+POM_LICENCE_URL=http://opensource.org/licenses/MIT
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=apptimize
+POM_DEVELOPER_NAME=Apptimize, Inc.

src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="com.segment.analytics.android.integrations.apptimize"/>
+<manifest package="com.apptimize.segment"/>

src/main/java/com/segment/analytics/android/integrations/apptimize/ApptimizeIntegration.java → src/main/java/com/apptimize/segment/ApptimizeIntegration.java

@@ -1,7 +1,8 @@
-package com.segment.analytics.android.integrations.apptimize;
+package com.apptimize.segment;
 
 import com.apptimize.Apptimize;
 import com.apptimize.Apptimize.OnExperimentRunListener;
+import com.apptimize.ApptimizeOptions;
 import com.segment.analytics.Analytics;
 import com.segment.analytics.Properties;
 import com.segment.analytics.ValueMap;
@@ -25,7 +26,8 @@ public class ApptimizeIntegration extends Integration<Void> implements OnExperim
     @Override public Integration<?> create(ValueMap settings, Analytics analytics) {
       String appkey = settings.getString("appkey");
       boolean listen = settings.getBoolean("listen", false);
-      return new ApptimizeIntegration(analytics, appkey, listen, analytics.logger(APPTIMIZE_KEY));
+      boolean eucs = settings.getBoolean("apptimizeEuDataCenter", false);
+      return new ApptimizeIntegration(analytics, appkey, listen, eucs, analytics.logger(APPTIMIZE_KEY));
     }
 
     @Override public String key() {
@@ -39,11 +41,15 @@ public class ApptimizeIntegration extends Integration<Void> implements OnExperim
   final Analytics analytics;
   final Logger logger;
 
-  ApptimizeIntegration(Analytics analytics, String appKey, boolean listen, Logger logger)
+  ApptimizeIntegration(Analytics analytics, String appKey, boolean listen, boolean eucs, Logger logger)
       throws IllegalStateException {
     this.analytics = analytics;
     this.logger = logger;
-    Apptimize.setup(analytics.getApplication(), appKey);
+    ApptimizeOptions apptimizeOptions = new ApptimizeOptions();
+    if(eucs) {
+      apptimizeOptions.setServerRegion(ApptimizeOptions.ServerRegion.EUCS);
+    }
+    Apptimize.setup(analytics.getApplication(), appKey, apptimizeOptions);
     this.logger.verbose("Apptimize.setup(context, %s)", appKey);
     if (listen) {
       Apptimize.setOnExperimentRunListener(this);
@@ -89,7 +95,11 @@ public class ApptimizeIntegration extends Integration<Void> implements OnExperim
 
   @Override
   public void onExperimentRun(String experimentName, String variantName, boolean firstRun) {
-    analytics.track("Experiment Viewed", new Properties().putValue("experimentName", experimentName)
-        .putValue("variationName", variantName));
+    if (firstRun) {
+      analytics.track(
+              "Experiment Viewed",
+              new Properties().putValue("experimentName", experimentName)
+          .putValue("variationName", variantName));
+    }
   }
 }

src/test/java/com/segment/analytics/android/integrations/apptimize/ApptimizeTest.java → src/test/java/com/apptimize/segment/ApptimizeTest.java

@@ -1,4 +1,4 @@
-package com.segment.analytics.android.integrations.apptimize;
+package com.apptimize.segment;
 
 import android.app.Activity;
 import android.app.Application;