Merge branch 'feature_newDemo' into dev

pythonzz · Mar 24, 2017 · c55026d · c55026d
2 parents 602b329 + 3016eae
commit c55026d
Show file tree

Hide file tree

Showing 121 changed files with 24,354 additions and 1,199 deletions.
diff --git a/atlas-demo/AtlasDemo/app/build.gradle b/atlas-demo/AtlasDemo/app/build.gradle
@@ -22,9 +22,9 @@ android {
         vectorDrawables.useSupportLibrary = true
     }
 
-//    dataBinding{
-//        enabled=true
-//    }
+    //    dataBinding{
+    //        enabled=true
+    //    }
 
     buildTypes {
         release {
@@ -59,13 +59,10 @@ atlas {
             }
         }
     }
-
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-//    bundleCompile project()
-//    providedCompile
     compile('com.taobao.android:atlas_core:5.0.6-rc9@aar') {
         transitive = true
     }
@@ -103,7 +100,7 @@ String getEnvValue(key, defValue) {
     return defValue;
 }
 
-tasks.whenTaskAdded { task ->
+tasks.whenTaskAdded {task ->
     if (task.name.contains("DebugAndroidTest")) {
         task.setEnabled(false);
     }

diff --git a/atlas-demo/AtlasDemo/build.gradle b/atlas-demo/AtlasDemo/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
     }
     dependencies {
-        classpath "com.taobao.android:atlasplugin:2.3.0.alpha4"
+        classpath "com.taobao.android:atlasplugin:2.3.0.alpha+"
     }
 }
 

diff --git a/atlas-gradle-plugin/dexpatch/build.gradle b/atlas-gradle-plugin/dexpatch/build.gradle
@@ -1,30 +1,6 @@
-apply plugin: 'java'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'com.jfrog.bintray'
-
-//buildscript {
-//
-//    repositories {
-//        mavenCentral()
-//        jcenter()
-//    }
-//    dependencies {
-////        classpath 'com.android.tools.build:gradle:2.2.0'
-//        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-//        classpath "com.github.dcendents:android-maven-gradle-plugin:1.4.1"
-//    }
-//}
-repositories {
-//    flatDir {
-//        dirs 'libs'
-//    }
-    mavenCentral()
-    jcenter()
 
-}
-
-archivesBaseName = 'dex_patch'
 
+apply plugin: 'java'
 sourceSets {
     main {
 //        groovy.srcDirs = ['src/main/groovy']
@@ -53,72 +29,6 @@ dependencies {
 
 }
 
-def siteUrl = 'https://github.com/alibaba/atlas'
-// 项目的主页
-def gitUrl = 'https://github.com/alibaba/atlas'
-// Git仓库的url
-install {
-    repositories.mavenInstaller {
-        // This generates POM.xml with proper parameters
-        pom {
-            project {
-                packaging 'jar'
-                // Add your description here
-                name 'dex_patch' //项目描述
-                // Set your license
-                licenses {
-                    license {
-                        name 'The Apache Software License, Version 2.0'
-                        url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                    }
-                }
-                developers {
-                    developer {
-                        id 'alibabaatlas' //填写的一些基本信息
-                        name 'dex_patch'
-                        email '[email protected]'
-                    }
-                }
-                scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
-                }
-            }
-        }
-    }
-}
-
-Properties properties = new Properties()
-def file = project.rootProject.file('local.properties')
-if (file.exists()) {
-    properties.load(file.newDataInputStream())
-}
-bintray {
-    user = properties.getProperty("bintray.user")
-    key = properties.getProperty("bintray.apikey")
-    configurations = ['archives']
-    pkg {
-        repo = "maven"
-        name = "dex_patch"    //发布到JCenter上的项目名字
-        websiteUrl = "atlas.alibaba.net"
-        vcsUrl = gitUrl
-        licenses = ["Apache-2.0"]
-        publish = true
-    }
-
-}
-
-task sourcesJar(type: Jar) {
-    from('src/main/java') {
-        include '**'
-    }
-    classifier = 'sources'
-}
-
-artifacts {
-    archives sourcesJar
-}
 
 group 'com.taobao.android'
-version "1.0.3.1"
+version "1.1.0.2"
diff --git a/atlas-gradle-plugin/dexpatch/src/main/java/com/taobao/android/BasePatchTool.java b/atlas-gradle-plugin/dexpatch/src/main/java/com/taobao/android/BasePatchTool.java
@@ -224,8 +224,8 @@
  */
 public class BasePatchTool {
 
-    protected static final String BASE_APK_UNZIP_NAME = "base.apk";
-    protected static final String NEW_APK_UNZIP_NAME = "new.apk";
+    public static final String BASE_APK_UNZIP_NAME = "base.apk";
+    public static final String NEW_APK_UNZIP_NAME = "new.apk";
     protected static final String DEX_NAME = "classes.dex";
     protected static final String DEX_SUFFIX = ".dex";
     protected static final String CLASSES = "classes";