Merge pull request #16 from optimizely/upgrade-java-core

Upgrade java core

Author: jophde

android-sdk/build.gradle

@@ -13,8 +13,9 @@ android {
         minSdkVersion min_sdk_version
         targetSdkVersion target_sdk_version
         versionCode 1
-        versionName "1.0"
+        versionName version_name
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        buildConfigField "String", "CLIENT_VERSION", "\"$version_name\""
     }
     testOptions {
         unitTests.returnDefaultValues = true

android-sdk/src/main/AndroidManifest.xml

@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.optimizely.ab.android.project_watcher"
+<manifest package="com.optimizely.ab.android.sdk"
           xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application>
         <service
-            android:name="com.optimizely.ab.android.sdk.DataFileService"
+            android:name=".DataFileService"
             android:enabled="true"
             android:exported="false">
         </service>
 
         <receiver
-            android:name="com.optimizely.ab.android.sdk.DataFileRescheduler"
+            android:name=".DataFileRescheduler"
             android:enabled="true"
             android:exported="false">
             <intent-filter>

android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java

@@ -32,7 +32,7 @@
 import com.optimizely.ab.android.event_handler.OptlyEventHandler;
 import com.optimizely.ab.android.shared.ServiceScheduler;
 import com.optimizely.ab.bucketing.UserExperimentRecord;
-import com.optimizely.ab.config.parser.ConfigParseException;
+import com.optimizely.ab.event.internal.payload.Event;
 import com.optimizely.user_experiment_record.AndroidUserExperimentRecord;
 
 import org.slf4j.Logger;
@@ -152,6 +152,8 @@ protected void onPostExecute(UserExperimentRecord userExperimentRecord) {
                     eventHandler.setDispatchInterval(eventHandlerDispatchInterval, eventHandlerDispatchIntervalTimeUnit);
                     Optimizely optimizely = Optimizely.builder(dataFile, eventHandler)
                             .withUserExperimentRecord(userExperimentRecord)
+                            .withClientEngine(Event.ClientEngine.ANDROID_SDK)
+                            .withClientVersion(BuildConfig.CLIENT_VERSION)
                             .build();
                     logger.info("Sending Optimizely instance to listener");
                     AndroidOptimizely androidOptimizely = new AndroidOptimizely(optimizely);

build.gradle

@@ -27,7 +27,7 @@ ext {
     min_sdk_version = 14
     target_sdk_version = 24
 
-    java_core_ver = "0.1.71"
+    java_core_ver = "1.0.1"
     android_logger_ver = "1.3.1"
     support_annotations_ver = "24.2.1"
     junit_ver = "4.12"
@@ -36,7 +36,7 @@ ext {
     dexmaker_ver = "1.2"
     espresso_ver = "2.2.2"
     gson_ver = "2.6.2"
-    version_name = "0.0.1"
+    version_name = "0.1.0"
     group_id = "com.optimizely.ab"
 }