Merge branch 'dev'

Author: zhongcang

atlas-core/build.gradle

@@ -1,7 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
- apply from: 'http://gitlab.alibaba-inc.com/android-build-system/buildscript/raw/master/mtl-publish.gradle'
+apply from: 'http://gitlab.alibaba-inc.com/android-build-system/buildscript/raw/master/mtl-publish.gradle'
+
+
+def mini = getEnvValue("mini", 'false')
+def commitTag = getEnvValue("commitTag", 'false')
 
 buildscript {
 
@@ -23,7 +27,20 @@ repositories {
 
 group = 'com.taobao.android'
 description = """atlas_core"""
-version '5.0.7.30'
+String postFix = mini=='true' ? "-mini" : "";
+version "5.0.7.52${postFix}-SNAPSHOT"
+
+String getEnvValue(key, defValue) {
+    def val = System.getProperty(key);
+    if (null != val) {
+        return val;
+    }
+    val = System.getenv(key);
+    if (null != val) {
+        return val;
+    }
+    return defValue;
+}
 
 
 sourceCompatibility = 1.7
@@ -55,12 +72,52 @@ tasks.whenTaskAdded {task ->
             new File(task.getDestinationDir(),"android/databinding/DataBindingComponent.class").delete();
             new File(task.getDestinationDir(),"android/databinding/ViewDataBinding.class").delete();
             new File(task.getDestinationDir(),"android/taobao/atlas/framework/FrameworkProperties.class").delete();
+            new File(task.getDestinationDir(),"android/taobao/atlas/bundleInfo/AtlasBundleInfoGenerator.class").delete();
+        }
+    } else if(task.name.equals('mergeReleaseJniLibFolders')){
+        task.doLast {
+            if(mini=='true') {
+                new File(project.buildDir, "intermediates/jniLibs/release/armeabi-v7a").deleteDir()
+                new File(project.buildDir, "intermediates/jniLibs/release/mips64").deleteDir()
+                new File(project.buildDir, "intermediates/jniLibs/release/arm64-v8a").deleteDir()
+                new File(project.buildDir, "intermediates/jniLibs/release/mips").deleteDir()
+                new File(project.buildDir, "intermediates/jniLibs/release/x86").deleteDir()
+                new File(project.buildDir, "intermediates/jniLibs/release/x86_64").deleteDir()
+            }
+
         }
     }
+
+//    if(task.name == "bintrayUpload"){
+//        task.doFirst{
+//            println "tag has been created!"
+//        }
+//
+//        task.doLast {
+//            String newTag = "v${version}"
+//            println "new Tag is ${newTag}"
+//            "git tag v${version}".execute()
+//            "git push origin v${version}".execute()
+//            println "tag v${version} has been created!"
+//        }
+//    }
+
+}
+
+
+project.gradle.buildFinished{
+    if(commitTag=='true') {
+        "git tag v${version}".execute()
+        "git push origin v${version}".execute()
+        "git push origin v${version}".execute()
+        println "tag v${version} has been created!"
+    }
 }
 
 
 
+
+
 android {
     compileSdkVersion 23
     buildToolsVersion '23.0.1'
@@ -74,6 +131,8 @@ android {
         }
     }
 
+
+
     defaultConfig {
         consumerProguardFiles 'proguard.cfg'
     }
@@ -82,6 +141,16 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
+
+    buildTypes {
+        release {
+            if(mini=='true') {
+                minifyEnabled true
+                proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg'
+            }
+        }
+    }
+
 }
 def siteUrl = 'https://github.com/alibaba/atlas'
 // 项目的主页

atlas-core/proguard.cfg

@@ -1,5 +1,16 @@
+-dontwarn java.awt.**
+-dontwarn com.taobao.**
+-dontwarn com.google.android.maps.**
+-dontwarn android.support.v7.widget.**
+-dontwarn android.support.v4.**
+-dontwarn android.taobao.atlas.**
+-dontwarn android.databinding.**
+-dontwarn android.app.**
+
+
 -keep class android.taobao.atlas.bridge.BridgeApplicationDelegate{*;}
 -keep class android.taobao.atlas.runtime.AtlasPreLauncher{*;}
+-keep class com.taobao.android.runtime.**{*;}
 -keepclassmembers class * implements android.taobao.atlas.runtime.AtlasPreLauncher {
     public <fields>;
     public <methods>;

atlas-core/src/main/java/android/content/pm/ParceledListSlice.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package android.content.pm;
+
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.RemoteException;
+import android.util.Log;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Transfer a large list of Parcelable objects across an IPC.  Splits into
+ * multiple transactions if needed.
+ *
+ * Caveat: for efficiency and security, all elements must be the same concrete type.
+ * In order to avoid writing the class name of each object, we must ensure that
+ * each object is the same type, or else unparceling then reparceling the data may yield
+ * a different result if the class name encoded in the Parcelable is a Base type.
+ * See b/17671747.
+ *
+ * @hide
+ */
+public class ParceledListSlice<T extends Parcelable> {
+    private static String TAG = "ParceledListSlice";
+    private static boolean DEBUG = false;
+
+    /*
+     * TODO get this number from somewhere else. For now set it to a quarter of
+     * the 1MB limit.
+     */
+
+
+    public static <T extends Parcelable> ParceledListSlice<T> emptyList() {
+        return new ParceledListSlice<T>(Collections.<T> emptyList());
+    }
+
+    public ParceledListSlice(List<T> list) {
+    }
+
+    @SuppressWarnings("unchecked")
+    private ParceledListSlice(Parcel p, ClassLoader loader) {
+
+    }
+
+    private static void verifySameType(final Class<?> expected, final Class<?> actual) {
+        if (!actual.equals(expected)) {
+            throw new IllegalArgumentException("Can't unparcel type "
+                    + actual.getName() + " in list of type "
+                    + expected.getName());
+        }
+    }
+
+    public List<T> getList() {
+        return null;
+    }
+
+
+
+
+}