From d314fbf2be7242704c58be1bc8e9b22e5d06c3eb Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Mon, 5 Dec 2022 11:26:03 -0500 Subject: [PATCH] refactor: rename to RNFS2 to prevent collision with old --- RNFS.podspec => RNFS2.podspec | 2 +- {RNFS.xcodeproj => RNFS2.xcodeproj}/project.pbxproj | 10 +++++----- android/src/main/AndroidManifest.xml | 2 +- .../main/java/com/{rnfs => rnfs2}/DownloadParams.java | 4 ++-- .../main/java/com/{rnfs => rnfs2}/DownloadResult.java | 2 +- .../src/main/java/com/{rnfs => rnfs2}/Downloader.java | 2 +- .../java/com/{rnfs => rnfs2}/IORejectionException.java | 2 +- .../src/main/java/com/{rnfs => rnfs2}/RNFSManager.java | 2 +- .../src/main/java/com/{rnfs => rnfs2}/RNFSPackage.java | 2 +- package.json | 1 + 10 files changed, 15 insertions(+), 14 deletions(-) rename RNFS.podspec => RNFS2.podspec (95%) rename {RNFS.xcodeproj => RNFS2.xcodeproj}/project.pbxproj (98%) rename android/src/main/java/com/{rnfs => rnfs2}/DownloadParams.java (97%) rename android/src/main/java/com/{rnfs => rnfs2}/DownloadResult.java (85%) rename android/src/main/java/com/{rnfs => rnfs2}/Downloader.java (99%) rename android/src/main/java/com/{rnfs => rnfs2}/IORejectionException.java (93%) rename android/src/main/java/com/{rnfs => rnfs2}/RNFSManager.java (99%) rename android/src/main/java/com/{rnfs => rnfs2}/RNFSPackage.java (97%) diff --git a/RNFS.podspec b/RNFS2.podspec similarity index 95% rename from RNFS.podspec rename to RNFS2.podspec index 74596cc5..0d7387fe 100644 --- a/RNFS.podspec +++ b/RNFS2.podspec @@ -2,7 +2,7 @@ require 'json' pjson = JSON.parse(File.read('package.json')) Pod::Spec.new do |s| - s.name = "RNFS" + s.name = "RNFS2" s.version = pjson["version"] s.homepage = "https://github.com/sourcetoad/react-native-fs2" s.summary = pjson["description"] diff --git a/RNFS.xcodeproj/project.pbxproj b/RNFS2.xcodeproj/project.pbxproj similarity index 98% rename from RNFS.xcodeproj/project.pbxproj rename to RNFS2.xcodeproj/project.pbxproj index 64a059bd..5e6426aa 100644 --- a/RNFS.xcodeproj/project.pbxproj +++ b/RNFS2.xcodeproj/project.pbxproj @@ -69,7 +69,7 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - F12AFB9A1ADAF8F800E0535D /* RNFS */ = { + F12AFB9A1ADAF8F800E0535D /* RNFS2 */ = { isa = PBXNativeTarget; buildConfigurationList = F12AFBAF1ADAF8F800E0535D /* Build configuration list for PBXNativeTarget "RNFS" */; buildPhases = ( @@ -81,7 +81,7 @@ ); dependencies = ( ); - name = RNFS; + name = RNFS2; productName = RNLocalNotification; productReference = F12AFB9B1ADAF8F800E0535D /* libRNFS.a */; productType = "com.apple.product-type.library.static"; @@ -113,7 +113,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - F12AFB9A1ADAF8F800E0535D /* RNFS */, + F12AFB9A1ADAF8F800E0535D /* RNFS2 */, ); }; /* End PBXProject section */ @@ -245,7 +245,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - F12AFB961ADAF8F800E0535D /* Build configuration list for PBXProject "RNFS" */ = { + F12AFB961ADAF8F800E0535D /* Build configuration list for PBXProject "RNFS2" */ = { isa = XCConfigurationList; buildConfigurations = ( F12AFBAD1ADAF8F800E0535D /* Debug */, @@ -254,7 +254,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - F12AFBAF1ADAF8F800E0535D /* Build configuration list for PBXNativeTarget "RNFS" */ = { + F12AFBAF1ADAF8F800E0535D /* Build configuration list for PBXNativeTarget "RNFS2" */ = { isa = XCConfigurationList; buildConfigurations = ( F12AFBB01ADAF8F800E0535D /* Debug */, diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index 6e54f659..66b50c2f 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.rnfs2" > diff --git a/android/src/main/java/com/rnfs/DownloadParams.java b/android/src/main/java/com/rnfs2/DownloadParams.java similarity index 97% rename from android/src/main/java/com/rnfs/DownloadParams.java rename to android/src/main/java/com/rnfs2/DownloadParams.java index 18658c39..a7b4c40d 100644 --- a/android/src/main/java/com/rnfs/DownloadParams.java +++ b/android/src/main/java/com/rnfs2/DownloadParams.java @@ -1,4 +1,4 @@ -package com.rnfs; +package com.rnfs2; import java.io.File; import java.net.URL; @@ -29,4 +29,4 @@ public interface OnDownloadProgress { public OnTaskCompleted onTaskCompleted; public OnDownloadBegin onDownloadBegin; public OnDownloadProgress onDownloadProgress; -} \ No newline at end of file +} diff --git a/android/src/main/java/com/rnfs/DownloadResult.java b/android/src/main/java/com/rnfs2/DownloadResult.java similarity index 85% rename from android/src/main/java/com/rnfs/DownloadResult.java rename to android/src/main/java/com/rnfs2/DownloadResult.java index 28922d61..8b042aed 100644 --- a/android/src/main/java/com/rnfs/DownloadResult.java +++ b/android/src/main/java/com/rnfs2/DownloadResult.java @@ -1,4 +1,4 @@ -package com.rnfs; +package com.rnfs2; public class DownloadResult { public int statusCode; diff --git a/android/src/main/java/com/rnfs/Downloader.java b/android/src/main/java/com/rnfs2/Downloader.java similarity index 99% rename from android/src/main/java/com/rnfs/Downloader.java rename to android/src/main/java/com/rnfs2/Downloader.java index 4da698eb..e382d7b4 100644 --- a/android/src/main/java/com/rnfs/Downloader.java +++ b/android/src/main/java/com/rnfs2/Downloader.java @@ -1,4 +1,4 @@ -package com.rnfs; +package com.rnfs2; import java.io.FileOutputStream; import java.io.BufferedInputStream; diff --git a/android/src/main/java/com/rnfs/IORejectionException.java b/android/src/main/java/com/rnfs2/IORejectionException.java similarity index 93% rename from android/src/main/java/com/rnfs/IORejectionException.java rename to android/src/main/java/com/rnfs2/IORejectionException.java index 6bf048fa..e243c15e 100644 --- a/android/src/main/java/com/rnfs/IORejectionException.java +++ b/android/src/main/java/com/rnfs2/IORejectionException.java @@ -1,4 +1,4 @@ -package com.rnfs; +package com.rnfs2; class IORejectionException extends Exception { private String code; diff --git a/android/src/main/java/com/rnfs/RNFSManager.java b/android/src/main/java/com/rnfs2/RNFSManager.java similarity index 99% rename from android/src/main/java/com/rnfs/RNFSManager.java rename to android/src/main/java/com/rnfs2/RNFSManager.java index 6e8f7056..dd67042b 100755 --- a/android/src/main/java/com/rnfs/RNFSManager.java +++ b/android/src/main/java/com/rnfs2/RNFSManager.java @@ -1,4 +1,4 @@ -package com.rnfs; +package com.rnfs2; import android.database.Cursor; import android.net.Uri; diff --git a/android/src/main/java/com/rnfs/RNFSPackage.java b/android/src/main/java/com/rnfs2/RNFSPackage.java similarity index 97% rename from android/src/main/java/com/rnfs/RNFSPackage.java rename to android/src/main/java/com/rnfs2/RNFSPackage.java index bdcc28a0..2c85dbb1 100644 --- a/android/src/main/java/com/rnfs/RNFSPackage.java +++ b/android/src/main/java/com/rnfs2/RNFSPackage.java @@ -1,4 +1,4 @@ -package com.rnfs; +package com.rnfs2; import androidx.annotation.NonNull; diff --git a/package.json b/package.json index 7d350e4e..eb9f355e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "lib", "android", "ios", + "RNFS2.xcodeproj", "*.podspec", "!example", "!lib/typescript/example",