Merge pull request #141 from mockingbot/update-ssziparchive

update ssziparchive

Author: plrthink

RNZipArchive.podspec

@@ -22,7 +22,7 @@ Pod::Spec.new do |s|
     ss.public_header_files = ['ios/RNZipArchive.h']
   end
 
-  s.subspec 'RNZASSZipArchive' do |ss|
+  s.subspec 'SSZipArchive' do |ss|
     ss.source_files = 'ios/SSZipArchive/*.{h,m}', 'ios/SSZipArchive/aes/*.{h,c}', 'ios/SSZipArchive/minizip/*.{h,c}'
     ss.private_header_files = 'ios/SSZipArchive/*.h', 'ios/SSZipArchive/aes/*.h', 'ios/SSZipArchive/minizip/*.h'
   end

example/android/app/build.gradle

@@ -137,8 +137,8 @@ android {
 }
 
 dependencies {
-    implementation project(':react-native-custom-tabs')
     implementation project(':react-native-zip-archive')
+    implementation project(':react-native-custom-tabs')
     implementation project(':react-native-fs')
     implementation project(':react-native-document-picker')
     implementation fileTree(dir: "libs", include: ["*.jar"])

example/android/app/src/main/java/com/example/MainApplication.java

@@ -3,8 +3,8 @@
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
-import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
 import com.rnziparchive.RNZipArchivePackage;
+import com.github.droibit.android.reactnative.customtabs.CustomTabsPackage;
 import com.rnfs.RNFSPackage;
 import com.reactnativedocumentpicker.ReactNativeDocumentPicker;
 import com.facebook.react.ReactNativeHost;
@@ -27,8 +27,8 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-            new CustomTabsPackage(),
             new RNZipArchivePackage(),
+            new CustomTabsPackage(),
             new RNFSPackage(),
             new ReactNativeDocumentPicker()
       );

example/android/settings.gradle

@@ -1,8 +1,8 @@
 rootProject.name = 'example'
-include ':react-native-custom-tabs'
-project(':react-native-custom-tabs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-custom-tabs/android')
 include ':react-native-zip-archive'
 project(':react-native-zip-archive').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-zip-archive/android')
+include ':react-native-custom-tabs'
+project(':react-native-custom-tabs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-custom-tabs/android')
 include ':react-native-fs'
 project(':react-native-fs').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fs/android')
 include ':react-native-document-picker'

example/ios/example-tvOS/Info.plist

@@ -0,0 +1,11 @@
+//
+//  Config.xcconfig
+//  RNZipArchive
+//
+//  Created by Pan Rui on 2019/6/18.
+//  Copyright © 2019 plrthink. All rights reserved.
+//
+
+// Configuration settings file format documentation can be found at:
+// https://help.apple.com/xcode/#/dev745c5c974
+GCC_PREPROCESSOR_DEFINITIONS = HAVE_INTTYPES_H HAVE_PKCRYPT HAVE_STDINT_H HAVE_WZAES HAVE_ZLIB MZ_ZIP_NO_SIGNING $(inherited)

example/ios/example.xcodeproj/project.pbxproj

@@ -12,8 +12,8 @@
 #else
 #import "RCTBridgeModule.h"
 #endif
-#import "SSZipArchive/RNZASSZipArchive.h"
+#import "SSZipArchive/SSZipArchive.h"
 
-@interface RNZipArchive : NSObject<RCTBridgeModule, RNZASSZipArchiveDelegate>
+@interface RNZipArchive : NSObject<RCTBridgeModule, SSZipArchiveDelegate>
 
 @end

ios/Config.xcconfig

@@ -25,7 +25,7 @@ @implementation RNZipArchive
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject) {
 
-    BOOL isPasswordProtected = [RNZASSZipArchive isFilePasswordProtectedAtPath:file];
+    BOOL isPasswordProtected = [SSZipArchive isFilePasswordProtectedAtPath:file];
     resolve([NSNumber numberWithBool:isPasswordProtected]);
 }
 
@@ -36,7 +36,7 @@ @implementation RNZipArchive
 
     [self zipArchiveProgressEvent:0 total:1 filePath:from]; // force 0%
 
-    BOOL success = [RNZASSZipArchive unzipFileAtPath:from toDestination:destinationPath overwrite:YES password:nil error:nil delegate:self];
+    BOOL success = [SSZipArchive unzipFileAtPath:from toDestination:destinationPath overwrite:YES password:nil error:nil delegate:self];
 
     [self zipArchiveProgressEvent:1 total:1 filePath:from]; // force 100%
 
@@ -56,7 +56,7 @@ @implementation RNZipArchive
 
     [self zipArchiveProgressEvent:0 total:1 filePath:from]; // force 0%
 
-    BOOL success = [RNZASSZipArchive unzipFileAtPath:from toDestination:destinationPath overwrite:YES password:password error:nil delegate:self];
+    BOOL success = [SSZipArchive unzipFileAtPath:from toDestination:destinationPath overwrite:YES password:password error:nil delegate:self];
 
     [self zipArchiveProgressEvent:1 total:1 filePath:from]; // force 100%
 
@@ -80,9 +80,9 @@ @implementation RNZipArchive
     BOOL success;
     [fileManager fileExistsAtPath:from isDirectory:&isDir];
     if (isDir) {
-        success = [RNZASSZipArchive createZipFileAtPath:destinationPath withContentsOfDirectory:from];
+        success = [SSZipArchive createZipFileAtPath:destinationPath withContentsOfDirectory:from];
     } else {
-        success = [RNZASSZipArchive createZipFileAtPath:destinationPath withFilesAtPaths:@[from]];
+        success = [SSZipArchive createZipFileAtPath:destinationPath withFilesAtPaths:@[from]];
     }
 
     [self zipArchiveProgressEvent:1 total:1 filePath:destinationPath]; // force 100%