Update build for gradle 2.4

safe-parcel/build.gradle

@@ -3,17 +3,17 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.3'
+        classpath 'com.android.tools.build:gradle:1.3.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
-
 apply plugin: 'com.android.library'
-apply from: 'gradle-mvn-push.gradle'
-
-group = 'org.microg'
-version = '1.1.0'
+apply plugin: 'com.github.dcendents.android-maven'
 
 android {
     compileSdkVersion 22
-    buildToolsVersion "22.0.0"
+    buildToolsVersion "22.0.1"
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_6
+    }
 }

safe-parcel/gradle.properties

@@ -1,6 +1,6 @@
 GROUP=org.microg
 POM_ARTIFACT_ID=safe-parcel
-VERSION_NAME=1.1.0
+VERSION_NAME=1.2-SNAPSHOT
 
 POM_NAME=µg SafeParcel
 POM_DESCRIPTION=Easy-to-use implementation of the "SafeParcel" format used for IPC in Play Services

safe-parcel/src/main/java/org/microg/safeparcel/SafeParcelUtil.java

@@ -55,7 +55,7 @@ public class SafeParcelUtil {
         if (object == null)
             throw new NullPointerException();
         Class clazz = object.getClass();
-        Map<Integer, Field> fieldMap = new HashMap<>();
+        Map<Integer, Field> fieldMap = new HashMap<Integer, Field>();
         while (clazz != null) {
             for (Field field : clazz.getDeclaredFields()) {
                 if (field.isAnnotationPresent(SafeParceled.class)) {