Build tools + Chromium update

app/build.gradle

@@ -14,15 +14,18 @@ version '1.0'
 group 'com.baker'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
 
     defaultConfig {
         applicationId project.property("application-id")
         minSdkVersion 14
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 10
         versionName "1.0"
+
+        // Enabled because google play services 7.5 pushes method limit over 65536
+        multiDexEnabled true
     }
 
     buildTypes {
@@ -36,10 +39,11 @@ android {
     }
 
     dexOptions {
-        incremental true
         javaMaxHeapSize "4g"
         preDexLibraries = false
     }
+    productFlavors {
+    }
 }
 
 // Release signing for debugging
@@ -48,27 +52,30 @@ if(project.hasProperty("extra-gradle") && new File(project.property("extra-gradl
 }
 
 repositories {
-    maven { url "http://dl.bintray.com/populov/maven" }
-    maven { url "https://download.01.org/crosswalk/releases/crosswalk/android/maven2" }
+    maven { url 'http://dl.bintray.com/populov/maven' }
+    maven { url 'https://download.01.org/crosswalk/releases/crosswalk/android/maven2' }
     mavenCentral()
-    maven {
-        url 'file://' + new File(System.getProperty('user.home'), '.m2/repository').absolutePath
-    }
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services:6.5.+'
+    compile 'com.google.android.gms:play-services:7.5.0'
     compile 'org.jsoup:jsoup:1.7.3'
     compile 'org.apache.commons:commons-compress:1.8.1'
     compile 'com.viewpagerindicator:library:2.4.1@aar'
-    compile 'com.android.support:appcompat-v7:21.+'
-    compile 'org.solovyev.android:checkout:0.6.2@aar'
+    compile 'com.android.support:appcompat-v7:22.2.1'
+    compile 'org.solovyev.android:checkout:0.7.4@aar'
     compile 'com.google.code.gson:gson:2.3.1'
     compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
     compile 'com.path:android-priority-jobqueue:1.1.2'
     compile 'de.greenrobot:eventbus:2.4.0'
-    compile 'org.zeroturnaround:zt-zip:1.8'
-    compile 'com.parse.bolts:bolts-android:1.+'
-    compile 'org.xwalk:xwalk_core_library:11.40.277.7'
+    compile 'com.parse.bolts:bolts-android:1.2.1'
+    compile 'org.xwalk:xwalk_core_library:12.41.296.9'
+
+    // Enabled because google play services 7.5 pushes method limit over 65536
+    compile 'com.android.support:multidex:1.0.0'
+
+    // org.zeroturnaround.zip requires this
+    compile 'org.slf4j:slf4j-api:1.7.12'
+
     compile fileTree(dir: 'libs', include: 'Parse-*.jar')
 }

app/src/main/java/com/bakerframework/baker/BakerApplication.java

@@ -35,6 +35,7 @@
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.support.annotation.NonNull;
+import android.support.multidex.MultiDexApplication;
 import android.util.Log;
 
 import com.bakerframework.baker.handler.PluginManager;
@@ -57,7 +58,7 @@
 import static org.solovyev.android.checkout.ProductTypes.IN_APP;
 import static org.solovyev.android.checkout.ProductTypes.SUBSCRIPTION;
 
-public class BakerApplication extends Application {
+public class BakerApplication extends MultiDexApplication {
     private static BakerApplication instance;
     private JobManager jobManager;
     private PluginManager pluginManager;

app/src/main/java/com/bakerframework/baker/activity/ShelfActivity.java

@@ -32,13 +32,13 @@
 import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBarActivity;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.Menu;
@@ -89,7 +89,7 @@
 
 import de.greenrobot.event.EventBus;
 
-public class ShelfActivity extends ActionBarActivity implements SwipeRefreshLayout.OnRefreshListener {
+public class ShelfActivity extends AppCompatActivity implements SwipeRefreshLayout.OnRefreshListener {
 
     public static final int STANDALONE_MAGAZINE_ACTIVITY_FINISH = 1;
     static final int SHELF_CHECKOUT_REQUEST_CODE = 0XCAFE;

app/src/main/java/com/bakerframework/baker/settings/SettingsActivity.java

@@ -28,19 +28,19 @@
 
 import android.app.ActionBar;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
 import com.bakerframework.baker.R;
 
 
-public class SettingsActivity extends ActionBarActivity {
+public class SettingsActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
         // Modify the action bar to use a custom layout to center the title.
-        this.getSupportActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
+        this.getSupportActionBar().setDisplayOptions( ActionBar.DISPLAY_SHOW_CUSTOM );
         this.getSupportActionBar().setCustomView(R.layout.settings_actionbar);
 
         getFragmentManager().beginTransaction()

app/src/main/java/com/google/android/vending/licensing/APKExpansionPolicy.java

@@ -68,10 +68,10 @@ public class APKExpansionPolicy implements Policy {
     private long mRetryCount;
     private long mLastResponseTime = 0;
     private int mLastResponse;
-    private final PreferenceObfuscator mPreferences;
-    private final Vector<String> mExpansionURLs = new Vector<String>();
-    private final Vector<String> mExpansionFileNames = new Vector<String>();
-    private final Vector<Long> mExpansionFileSizes = new Vector<Long>();
+    private PreferenceObfuscator mPreferences;
+    private Vector<String> mExpansionURLs = new Vector<String>();
+    private Vector<String> mExpansionFileNames = new Vector<String>();
+    private Vector<Long> mExpansionFileSizes = new Vector<Long>();
 
     /**
      * The design of the protocol supports n files. Currently the market can
@@ -127,7 +127,7 @@ public void resetPolicy() {
      * @param rawData the raw server response data
      */
     public void processServerResponse(int response,
-            ResponseData rawData) {
+            com.google.android.vending.licensing.ResponseData rawData) {
 
         // Update retry counter
         if (response != Policy.RETRY) {

app/src/main/java/com/google/android/vending/licensing/ILicenseResultListener.java

@@ -9,12 +9,12 @@
 import android.os.IInterface;
 import android.os.Binder;
 import android.os.Parcel;
-public interface ILicenseResultListener extends IInterface
+public interface ILicenseResultListener extends android.os.IInterface
 {
 /** Local-side IPC implementation stub class. */
-public static abstract class Stub extends Binder implements ILicenseResultListener
+public static abstract class Stub extends android.os.Binder implements com.google.android.vending.licensing.ILicenseResultListener
 {
-private static final String DESCRIPTOR = "com.android.vending.licensing.ILicenseResultListener";
+private static final java.lang.String DESCRIPTOR = "com.android.vending.licensing.ILicenseResultListener";
 /** Construct the stub at attach it to the interface. */
 public Stub()
 {
@@ -24,22 +24,22 @@ public Stub()
  * Cast an IBinder object into an ILicenseResultListener interface,
  * generating a proxy if needed.
  */
-public static ILicenseResultListener asInterface(IBinder obj)
+public static com.google.android.vending.licensing.ILicenseResultListener asInterface(android.os.IBinder obj)
 {
 if ((obj==null)) {
 return null;
 }
-IInterface iin = (IInterface)obj.queryLocalInterface(DESCRIPTOR);
-if (((iin!=null)&&(iin instanceof ILicenseResultListener))) {
-return ((ILicenseResultListener)iin);
+android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
+if (((iin!=null)&&(iin instanceof com.google.android.vending.licensing.ILicenseResultListener))) {
+return ((com.google.android.vending.licensing.ILicenseResultListener)iin);
 }
-return new Proxy(obj);
+return new com.google.android.vending.licensing.ILicenseResultListener.Stub.Proxy(obj);
 }
-public IBinder asBinder()
+public android.os.IBinder asBinder()
 {
 return this;
 }
-public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException
+public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
 {
 switch (code)
 {
@@ -53,34 +53,34 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws
 data.enforceInterface(DESCRIPTOR);
 int _arg0;
 _arg0 = data.readInt();
-String _arg1;
+java.lang.String _arg1;
 _arg1 = data.readString();
-String _arg2;
+java.lang.String _arg2;
 _arg2 = data.readString();
 this.verifyLicense(_arg0, _arg1, _arg2);
 return true;
 }
 }
 return super.onTransact(code, data, reply, flags);
 }
-private static class Proxy implements ILicenseResultListener
+private static class Proxy implements com.google.android.vending.licensing.ILicenseResultListener
 {
-private final IBinder mRemote;
-Proxy(IBinder remote)
+private android.os.IBinder mRemote;
+Proxy(android.os.IBinder remote)
 {
 mRemote = remote;
 }
-public IBinder asBinder()
+public android.os.IBinder asBinder()
 {
 return mRemote;
 }
-public String getInterfaceDescriptor()
+public java.lang.String getInterfaceDescriptor()
 {
 return DESCRIPTOR;
 }
-public void verifyLicense(int responseCode, String signedData, String signature) throws RemoteException
+public void verifyLicense(int responseCode, java.lang.String signedData, java.lang.String signature) throws android.os.RemoteException
 {
-Parcel _data = Parcel.obtain();
+android.os.Parcel _data = android.os.Parcel.obtain();
 try {
 _data.writeInterfaceToken(DESCRIPTOR);
 _data.writeInt(responseCode);
@@ -95,5 +95,5 @@ public void verifyLicense(int responseCode, String signedData, String signature)
 }
 static final int TRANSACTION_verifyLicense = (IBinder.FIRST_CALL_TRANSACTION + 0);
 }
-public void verifyLicense(int responseCode, String signedData, String signature) throws RemoteException;
+public void verifyLicense(int responseCode, java.lang.String signedData, java.lang.String signature) throws android.os.RemoteException;
 }

app/src/main/java/com/google/android/vending/licensing/ILicensingService.java

@@ -9,12 +9,12 @@
 import android.os.IInterface;
 import android.os.Binder;
 import android.os.Parcel;
-public interface ILicensingService extends IInterface
+public interface ILicensingService extends android.os.IInterface
 {
 /** Local-side IPC implementation stub class. */
-public static abstract class Stub extends Binder implements ILicensingService
+public static abstract class Stub extends android.os.Binder implements com.google.android.vending.licensing.ILicensingService
 {
-private static final String DESCRIPTOR = "com.android.vending.licensing.ILicensingService";
+private static final java.lang.String DESCRIPTOR = "com.android.vending.licensing.ILicensingService";
 /** Construct the stub at attach it to the interface. */
 public Stub()
 {
@@ -24,22 +24,22 @@ public Stub()
  * Cast an IBinder object into an ILicensingService interface,
  * generating a proxy if needed.
  */
-public static ILicensingService asInterface(IBinder obj)
+public static com.google.android.vending.licensing.ILicensingService asInterface(android.os.IBinder obj)
 {
 if ((obj==null)) {
 return null;
 }
-IInterface iin = (IInterface)obj.queryLocalInterface(DESCRIPTOR);
-if (((iin!=null)&&(iin instanceof ILicensingService))) {
-return ((ILicensingService)iin);
+android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
+if (((iin!=null)&&(iin instanceof com.google.android.vending.licensing.ILicensingService))) {
+return ((com.google.android.vending.licensing.ILicensingService)iin);
 }
-return new Proxy(obj);
+return new com.google.android.vending.licensing.ILicensingService.Stub.Proxy(obj);
 }
-public IBinder asBinder()
+public android.os.IBinder asBinder()
 {
 return this;
 }
-public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws RemoteException
+public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
 {
 switch (code)
 {
@@ -53,7 +53,7 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws
 data.enforceInterface(DESCRIPTOR);
 long _arg0;
 _arg0 = data.readLong();
-String _arg1;
+java.lang.String _arg1;
 _arg1 = data.readString();
 com.google.android.vending.licensing.ILicenseResultListener _arg2;
 _arg2 = com.google.android.vending.licensing.ILicenseResultListener.Stub.asInterface(data.readStrongBinder());
@@ -63,24 +63,24 @@ public boolean onTransact(int code, Parcel data, Parcel reply, int flags) throws
 }
 return super.onTransact(code, data, reply, flags);
 }
-private static class Proxy implements ILicensingService
+private static class Proxy implements com.google.android.vending.licensing.ILicensingService
 {
-private final IBinder mRemote;
-Proxy(IBinder remote)
+private android.os.IBinder mRemote;
+Proxy(android.os.IBinder remote)
 {
 mRemote = remote;
 }
-public IBinder asBinder()
+public android.os.IBinder asBinder()
 {
 return mRemote;
 }
-public String getInterfaceDescriptor()
+public java.lang.String getInterfaceDescriptor()
 {
 return DESCRIPTOR;
 }
-public void checkLicense(long nonce, String packageName, com.google.android.vending.licensing.ILicenseResultListener listener) throws RemoteException
+public void checkLicense(long nonce, java.lang.String packageName, com.google.android.vending.licensing.ILicenseResultListener listener) throws android.os.RemoteException
 {
-Parcel _data = Parcel.obtain();
+android.os.Parcel _data = android.os.Parcel.obtain();
 try {
 _data.writeInterfaceToken(DESCRIPTOR);
 _data.writeLong(nonce);
@@ -95,5 +95,5 @@ public void checkLicense(long nonce, String packageName, com.google.android.vend
 }
 static final int TRANSACTION_checkLicense = (IBinder.FIRST_CALL_TRANSACTION + 0);
 }
-public void checkLicense(long nonce, String packageName, com.google.android.vending.licensing.ILicenseResultListener listener) throws RemoteException;
+public void checkLicense(long nonce, java.lang.String packageName, com.google.android.vending.licensing.ILicenseResultListener listener) throws android.os.RemoteException;
 }