Merge pull request alibaba#46 from lirenlong/spellerror

fix the spelling of Bundle
pythonzz · Mar 18, 2017 · b5c5655 · b5c5655
2 parents 28aabd4 + 54d7ac5
commit b5c5655
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/atlas-core/src/main/java/android/taobao/atlas/framework/Framework.java b/atlas-core/src/main/java/android/taobao/atlas/framework/Framework.java
@@ -915,7 +915,7 @@ static BundleImpl installNewBundle(final String location, final InputStream in)t
     }
 
     /**
-     * install a bundle from input file, the file will move to bunlde storage directory.
+     * install a bundle from input file, the file will move to bundle storage directory.
      *
      * @param location the bundle location.
      * @param file     the input file.

diff --git a/atlas-core/src/main/java/android/taobao/atlas/startup/KernalVersionManager.java b/atlas-core/src/main/java/android/taobao/atlas/startup/KernalVersionManager.java
@@ -344,7 +344,7 @@ public void init(){
         DEXPATCH_VERSION = dexpatchVersion;
         DEXPATCH_BUNDLES = dexPatchBundles;
 
-        parseUpdatedBunldes();
+        parseUpdatedBundles();
     }
 
     public void removeBaseLineInfo(){
@@ -416,7 +416,7 @@ public long dexPatchVersion(){
         return DEXPATCH_VERSION;
     }
 
-    public synchronized void parseUpdatedBunldes(){
+    public synchronized void parseUpdatedBundles(){
         if(CURRENT_UPDATE_BUNDLES!=null){
             String[] bundles = CURRENT_UPDATE_BUNDLES.split(";");
             if(bundles!=null && bundles.length>0){

diff --git a/.../src/main/java/com/taobao/android/builder/tasks/app/manifest/PostProcessManifestTask.java b/.../src/main/java/com/taobao/android/builder/tasks/app/manifest/PostProcessManifestTask.java
@@ -254,7 +254,7 @@ public class PostProcessManifestTask extends DefaultTask {
 
     @InputFile
     @Optional
-    private File bunldeBaseInfoFile;
+    private File bundleBaseInfoFile;
 
     public boolean addMultiDex;
 
@@ -311,7 +311,7 @@ public void postProcess() throws IOException, DocumentException {
             ManifestFileUtils.postProcessManifests(getMainManifestFile(),
                                                    getLibManifestMap(),
                                                    getLibManifestDepenendyMap(),
-                                                   bunldeBaseInfoFile,
+                                                   bundleBaseInfoFile,
                                                    manifestOptions,
                                                    addMultiDex,
                                                    remoteBundles);
@@ -382,7 +382,7 @@ public List<? extends AndroidLibrary> call() {
                                             }
                                         });
 
-            postProcessManifestsTask.bunldeBaseInfoFile = new File(variantContext.getScope()
+            postProcessManifestsTask.bundleBaseInfoFile = new File(variantContext.getScope()
                                                                            .getGlobalScope()
                                                                            .getProject()
                                                                            .getProjectDir(),

diff --git a/...as-plugin/src/main/java/com/taobao/android/builder/tools/bundleinfo/ApkFileListUtils.java b/...as-plugin/src/main/java/com/taobao/android/builder/tools/bundleinfo/ApkFileListUtils.java
@@ -243,11 +243,11 @@ public static void recordApkFileInfos(AppVariantContext appVariantContext) {
         }
         inited = true;
 
-        List<File> mainBunldeResFolders = new ArrayList<File>();
-        mainBunldeResFolders.add(appVariantContext.getScope().getVariantData().mergeResourcesTask.getOutputDir());
+        List<File> mainBundleResFolders = new ArrayList<File>();
+        mainBundleResFolders.add(appVariantContext.getScope().getVariantData().mergeResourcesTask.getOutputDir());
         prepareApkFileList(appVariantContext.getScope().getVariantData().mergeAssetsTask.getOutputDir(),
                 "assets");
-        for (File resFolder : mainBunldeResFolders) {
+        for (File resFolder : mainBundleResFolders) {
             prepareApkFileList(resFolder, "res");
         }
 

diff --git a/...dle-plugin/dexpatch/src/main/java/com/taobao/android/tpatch/builder/PatchFileBuilder.java b/...dle-plugin/dexpatch/src/main/java/com/taobao/android/tpatch/builder/PatchFileBuilder.java
@@ -578,13 +578,13 @@ private PatchInfo createHisTPatch(String targetVersion, ILogger logger) throws I
                 if (soFile.exists() || bundleInfo.getVersion().equals(ROLLBACK_VERSION)) {
                     continue;
                 }
-                zipBunldeSo(bundleFolder, soFile);
+                zipBundleSo(bundleFolder, soFile);
                 FileUtils.deleteDirectory(bundleFolder);
             }
         }
         File tPatchFile = new File(patchsFolder, newPatchInfo.getFileName());
         if (tPatchFile.exists()) FileUtils.deleteQuietly(tPatchFile);
-        zipBunldeSo(destTPathTmpFolder, tPatchFile);
+        zipBundleSo(destTPathTmpFolder, tPatchFile);
         if (null != logger) {
             logger.info("[TPatchFile]" + tPatchFile.getAbsolutePath());
         }
@@ -597,7 +597,7 @@ private PatchInfo createHisTPatch(String targetVersion, ILogger logger) throws I
      * @param bundleFolder
      * @param soOutputFile
      */
-    private void zipBunldeSo(File bundleFolder, File soOutputFile) throws PatchException {
+    private void zipBundleSo(File bundleFolder, File soOutputFile) throws PatchException {
         try {
             Manifest manifest = createManifest();
             FileOutputStream fileOutputStream = new FileOutputStream(soOutputFile);