* [Android] Rename Android package name from 'com.taobao.weex' to 'or…

…g.apache.weex'
apache · Sep 23, 2019 · 19fc503 · 19fc503
1 parent ec1ec23
commit 19fc503
Show file tree

Hide file tree

Showing 412 changed files with 2,238 additions and 2,291 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -58,7 +58,7 @@ ext {
     fastjsonLibVersion="1.1.70.android"
     //Default value for disableCov is false
     disableCov = project.hasProperty("disableCov") && disableCov.equals("true")
-    useApachePackageName = project.hasProperty('apachePackageName') ? project.property('apachePackageName').toBoolean() : true
+    useApachePackageName = project.hasProperty('apachePackageName') ? project.property('apachePackageName').toBoolean() : false
     implementFromWeex = true
 }
 

diff --git a/android/sdk/.gitignore b/android/sdk/.gitignore
@@ -19,3 +19,4 @@ assets/weex-rax-api.js
 /libs/armeabi
 
 /src/legacyRelease/
+proguard-rules-legacy.pro
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
@@ -146,9 +146,9 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), useApachePackageName ? 'proguard-rules.pro' : 'proguard-rules-legacy.pro'
             buildConfigField "boolean", "ENABLE_TRACE", "false"
-            consumerProguardFiles 'proguard-rules.pro'
+            consumerProguardFiles useApachePackageName ? 'proguard-rules.pro' : 'proguard-rules-legacy.pro'
         }
 
         debug {
@@ -265,4 +265,4 @@ task weex_core_license(type: com.hierynomus.gradle.license.tasks.LicenseFormat)
                      'Source/include/JavaScriptCore/**/*.cpp'])
 }
 
-preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyASanLib, checkNdkVersion, licenseFormat
+preBuild.dependsOn copyAndRenameCppSourceFile, copyAndRenamePackage, copyManifest, copyProguard, copyASanLib, checkNdkVersion, licenseFormat
diff --git a/android/sdk/buildSrc/packageName.gradle b/android/sdk/buildSrc/packageName.gradle
@@ -3,15 +3,15 @@ task copyAndRenamePackage(type: Copy) {
         doFirst {
             delete new File('src/legacyRelease/java')
         }
-        from new File('src/main/java/com/taobao/weex')
-        into new File('src/legacyRelease/java/org/apache/weex')
+        from new File('src/main/java/org/apache/weex')
+        into new File('src/legacyRelease/java/com/taobao/weex')
         filter { String line ->
-            line.replaceAll(/^(package com\.taobao)(\.weex.*)$/, { _, packageName, suffix ->
-                "package org.apache${suffix}"
-            }).replaceAll(/^(import com\.taobao)(\.weex.*)$/, { _, packageName, suffix ->
-                "import org.apache${suffix}"
-            }).replaceAll(/^(import static com\.taobao)(\.weex.*)$/, { _, packageName, suffix ->
-                "import static org.apache${suffix}"
+            line.replaceAll(/^(package org\.apache)(\.weex.*)$/, { _, packageName, suffix ->
+                "package com.taobao${suffix}"
+            }).replaceAll(/^(import org\.apache)(\.weex.*)$/, { _, packageName, suffix ->
+                "import com.taobao${suffix}"
+            }).replaceAll(/^(import static org\.apache)(\.weex.*)$/, { _, packageName, suffix ->
+                "import static com.taobao${suffix}"
             })
         }
     }
@@ -25,8 +25,24 @@ task copyManifest(type: Copy){
         from new File('src/main/AndroidManifest.xml')
         into new File('src/legacyRelease')
         filter { String line ->
-            line.replaceAll(/(com\.taobao)(\.weex.*)/, { _, packageName, suffix ->
-                "org.apache${suffix}"
+            line.replaceAll(/(org\.apache)(\.weex.*)/, { _, packageName, suffix ->
+                "com.taobao${suffix}"
+            })
+        }
+    }
+}
+
+task copyProguard(type: Copy){
+    if(!project.useApachePackageName){
+        doFirst {
+            delete new File('proguard-rules-legacy.pro')
+        }
+        from new File('proguard-rules.pro')
+        into new File('.')
+        rename 'proguard-rules.pro', 'proguard-rules-legacy.pro'
+        filter { String line ->
+            line.replaceAll(/(org\.apache)(\.weex.*)/, { _, packageName, suffix ->
+                "com.taobao${suffix}"
             })
         }
     }
@@ -49,9 +65,9 @@ task copyAndRenameCppSourceFile(type: Copy, dependsOn: copyOtherCppFile){
         into new File('src/legacyRelease/cpp')
         include '**/*.cpp', '**/*.cc', '**/*.c', '**/*.h', '**/*.hpp'
         filter { String line ->
-            line.replaceAll('(.*".*)(com/taobao/weex)(.*".*)', { _, prefix, packageName, suffix ->
-                logger.info("Content substation in .cpp/.h files happpened, \n Input: ${line}, \n Output: ${prefix}org/apache/weex${suffix}")
-                "${prefix}org/apache/weex${suffix}"
+            line.replaceAll('(.*".*)(org/apache/weex)(.*".*)', { _, prefix, packageName, suffix ->
+                logger.info("Content substation in .cpp/.h files happpened, \n Input: ${line}, \n Output: ${prefix}com/taobao/weex${suffix}")
+                "${prefix}com/taobao/weex${suffix}"
             })
         }
     }

diff --git a/android/sdk/proguard-rules.pro b/android/sdk/proguard-rules.pro
@@ -34,8 +34,8 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
--keep class com.taobao.weex.bridge.** { *; }
--keep class com.taobao.weex.layout.** { *; }
--keep class com.taobao.weex.WXSDKEngine { *; }
--keep class com.taobao.weex.base.SystemMessageHandler { *; }
--dontwarn com.taobao.weex.bridge.**
+-keep class org.apache.weex.bridge.** { *; }
+-keep class org.apache.weex.layout.** { *; }
+-keep class org.apache.weex.WXSDKEngine { *; }
+-keep class org.apache.weex.base.SystemMessageHandler { *; }
+-dontwarn org.apache.weex.bridge.**
diff --git a/android/sdk/src/main/AndroidManifest.xml b/android/sdk/src/main/AndroidManifest.xml
@@ -18,6 +18,6 @@ specific language governing permissions and limitations
 under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.taobao.weex">
+          package="org.apache.weex">
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
 </manifest>
diff --git a/...va/com/taobao/weex/ComponentObserver.java → ...va/org/apache/weex/ComponentObserver.java b/...va/com/taobao/weex/ComponentObserver.java → ...va/org/apache/weex/ComponentObserver.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.view.View;
 
-import com.taobao.weex.ui.component.WXComponent;
+import org.apache.weex.ui.component.WXComponent;
 
 /**
  * Created by sospartan on 14/06/2017.

diff --git a/...taobao/weex/IWXActivityStateListener.java → ...apache/weex/IWXActivityStateListener.java b/...taobao/weex/IWXActivityStateListener.java → ...apache/weex/IWXActivityStateListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 /**
  * Listener class for activity lifecycle

diff --git a/...va/com/taobao/weex/IWXRenderListener.java → ...va/org/apache/weex/IWXRenderListener.java b/...va/com/taobao/weex/IWXRenderListener.java → ...va/org/apache/weex/IWXRenderListener.java
@@ -16,16 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.view.View;
+import org.apache.weex.common.WXRenderStrategy;
 
 public interface IWXRenderListener {
 
   /**
-   * If {@link com.taobao.weex.common.WXRenderStrategy#APPEND_ASYNC} is applied, this method
+   * If {@link WXRenderStrategy#APPEND_ASYNC} is applied, this method
    * will be invoked when the rendering of first view is finish.
-   * If {@link com.taobao.weex.common.WXRenderStrategy#APPEND_ONCE} is applied, this method will
+   * If {@link WXRenderStrategy#APPEND_ONCE} is applied, this method will
    * be invoked when the rendering of the view tree is finished.
    */
   void onViewCreated(WXSDKInstance instance, View view);

diff --git a/...om/taobao/weex/IWXStatisticsListener.java → ...rg/apache/weex/IWXStatisticsListener.java b/...om/taobao/weex/IWXStatisticsListener.java → ...rg/apache/weex/IWXStatisticsListener.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 public interface IWXStatisticsListener {
   /**

diff --git a/...main/java/com/taobao/weex/InitConfig.java → ...main/java/org/apache/weex/InitConfig.java b/...main/java/com/taobao/weex/InitConfig.java → ...main/java/org/apache/weex/InitConfig.java
@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.support.annotation.NonNull;
-import com.taobao.weex.adapter.ClassLoaderAdapter;
-import com.taobao.weex.adapter.IDrawableLoader;
-import com.taobao.weex.adapter.IWXHttpAdapter;
-import com.taobao.weex.adapter.IWXImgLoaderAdapter;
-import com.taobao.weex.adapter.IWXJSExceptionAdapter;
-import com.taobao.weex.adapter.IWXJsFileLoaderAdapter;
-import com.taobao.weex.adapter.IWXJscProcessManager;
-import com.taobao.weex.adapter.IWXSoLoaderAdapter;
-import com.taobao.weex.adapter.IWXUserTrackAdapter;
-import com.taobao.weex.adapter.URIAdapter;
-import com.taobao.weex.appfram.storage.IWXStorageAdapter;
-import com.taobao.weex.appfram.websocket.IWebSocketAdapterFactory;
-import com.taobao.weex.performance.IApmGenerator;
+import org.apache.weex.adapter.ClassLoaderAdapter;
+import org.apache.weex.adapter.IDrawableLoader;
+import org.apache.weex.adapter.IWXHttpAdapter;
+import org.apache.weex.adapter.IWXImgLoaderAdapter;
+import org.apache.weex.adapter.IWXJSExceptionAdapter;
+import org.apache.weex.adapter.IWXJsFileLoaderAdapter;
+import org.apache.weex.adapter.IWXJscProcessManager;
+import org.apache.weex.adapter.IWXSoLoaderAdapter;
+import org.apache.weex.adapter.IWXUserTrackAdapter;
+import org.apache.weex.adapter.URIAdapter;
+import org.apache.weex.appfram.storage.IWXStorageAdapter;
+import org.apache.weex.appfram.websocket.IWebSocketAdapterFactory;
+import org.apache.weex.performance.IApmGenerator;
 import java.util.LinkedList;
 import java.util.List;
 

diff --git a/...java/com/taobao/weex/RenderContainer.java → ...java/org/apache/weex/RenderContainer.java b/...java/com/taobao/weex/RenderContainer.java → ...java/org/apache/weex/RenderContainer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -25,7 +25,7 @@
 import android.view.View;
 
 
-import com.taobao.weex.render.WXAbstractRenderContainer;
+import org.apache.weex.render.WXAbstractRenderContainer;
 
 /**
  * Created by sospartan on 08/10/2016.

diff --git a/...src/main/java/com/taobao/weex/Script.java → ...src/main/java/org/apache/weex/Script.java b/...src/main/java/com/taobao/weex/Script.java → ...src/main/java/org/apache/weex/Script.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.text.TextUtils;
 

diff --git a/...n/java/com/taobao/weex/WXEnvironment.java → ...n/java/org/apache/weex/WXEnvironment.java b/...n/java/com/taobao/weex/WXEnvironment.java → ...n/java/org/apache/weex/WXEnvironment.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import static android.content.Context.MODE_PRIVATE;
 
@@ -31,15 +31,16 @@
 import android.os.Environment;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
-import com.taobao.weex.common.WXConfig;
-import com.taobao.weex.utils.FontDO;
-import com.taobao.weex.utils.LogLevel;
-import com.taobao.weex.utils.TypefaceUtil;
-import com.taobao.weex.utils.WXFileUtils;
-import com.taobao.weex.utils.WXLogUtils;
-import com.taobao.weex.utils.WXSoInstallMgrSdk;
-import com.taobao.weex.utils.WXUtils;
-import com.taobao.weex.utils.WXViewUtils;
+import com.taobao.weex.R;
+import org.apache.weex.common.WXConfig;
+import org.apache.weex.utils.FontDO;
+import org.apache.weex.utils.LogLevel;
+import org.apache.weex.utils.TypefaceUtil;
+import org.apache.weex.utils.WXFileUtils;
+import org.apache.weex.utils.WXLogUtils;
+import org.apache.weex.utils.WXSoInstallMgrSdk;
+import org.apache.weex.utils.WXUtils;
+import org.apache.weex.utils.WXViewUtils;
 import dalvik.system.PathClassLoader;
 import java.io.BufferedReader;
 import java.io.File;

diff --git a/.../com/taobao/weex/WXGlobalEventModule.java → .../org/apache/weex/WXGlobalEventModule.java b/.../com/taobao/weex/WXGlobalEventModule.java → .../org/apache/weex/WXGlobalEventModule.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
-import com.taobao.weex.annotation.JSMethod;
-import com.taobao.weex.common.WXModule;
+import org.apache.weex.annotation.JSMethod;
+import org.apache.weex.common.WXModule;
 
 import java.util.Map;
 

diff --git a/...om/taobao/weex/WXGlobalEventReceiver.java → ...rg/apache/weex/WXGlobalEventReceiver.java b/...om/taobao/weex/WXGlobalEventReceiver.java → ...rg/apache/weex/WXGlobalEventReceiver.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
-import com.taobao.weex.utils.WXLogUtils;
+import org.apache.weex.utils.WXLogUtils;
 
 import java.util.HashMap;
 

diff --git a/.../java/com/taobao/weex/WXHttpListener.java → .../java/org/apache/weex/WXHttpListener.java b/.../java/com/taobao/weex/WXHttpListener.java → .../java/org/apache/weex/WXHttpListener.java
@@ -16,30 +16,30 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.taobao.weex;
+package org.apache.weex;
 
 import android.net.Uri;
 import android.text.TextUtils;
 
-import com.taobao.weex.adapter.IWXHttpAdapter;
-import com.taobao.weex.adapter.IWXUserTrackAdapter;
-import com.taobao.weex.common.WXErrorCode;
-import com.taobao.weex.common.WXPerformance;
-import com.taobao.weex.common.WXRenderStrategy;
-import com.taobao.weex.common.WXResponse;
-import com.taobao.weex.performance.WXInstanceApm;
-import com.taobao.weex.tracing.WXTracing;
-import com.taobao.weex.utils.WXLogUtils;
-import com.taobao.weex.utils.tools.LogDetail;
+import org.apache.weex.adapter.IWXUserTrackAdapter;
+import org.apache.weex.common.WXErrorCode;
+import org.apache.weex.common.WXPerformance;
+import org.apache.weex.common.WXRenderStrategy;
+import org.apache.weex.common.WXResponse;
+import org.apache.weex.performance.WXInstanceApm;
+import org.apache.weex.tracing.WXTracing;
+import org.apache.weex.utils.WXLogUtils;
+import org.apache.weex.utils.tools.LogDetail;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.apache.weex.adapter.IWXHttpAdapter.OnHttpListener;
 
 /**
  * load bundle js listener
  */
-public class WXHttpListener implements IWXHttpAdapter.OnHttpListener {
+public class WXHttpListener implements OnHttpListener {
 
     private String pageName;
     private Map<String, Object> options;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ assets/weex-rax-api.js
		/libs/armeabi

		/src/legacyRelease/
		proguard-rules-legacy.pro