Skip to content

Commit

Permalink
Merge pull request #25 from SD10/firebase/update
Browse files Browse the repository at this point in the history 
Update to Firebase 3 & Fix Naming Collisions
  • Loading branch information
@SD10
SD10 authored Jul 17, 2017
2 parents d1be666 + 7af5231 commit 0991362
Show file tree
Hide file tree
Showing 129 changed files with 6,135 additions and 2,187 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@ N/A

---

### [1.0.0]()

### API Breaking Changes
- Updated to FirebaseDatabase `4.0.0` and FirebaseStorage `2.0.0`.
- All Nora types are now prefixed with `NR` to prevent Firebase 3 naming collisions. [#25](https://github.com/SD10/Nora/pull/25) by [@SD10](https://github.com/SD10)

---

### [0.1.1](https://github.com/SD10/Nora/releases/tag/0.1.0)

### Bugfixes
Expand Down
126 changes: 89 additions & 37 deletions Nora.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,17 @@
07E554301E96B33C00D81D9B /* NoraTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07E5542F1E96B33C00D81D9B /* NoraTests.swift */; };
07E554321E96B33C00D81D9B /* Nora.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B062C6CF1E946B59006C3CB8 /* Nora.framework */; };
4C3DA810DFDAB2B7494B5061 /* Pods_Nora.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C4C9489816D143B076B1BA00 /* Pods_Nora.framework */; };
B0602A3C1E98F03D0087BBD9 /* DatabaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A321E98F03D0087BBD9 /* DatabaseProvider.swift */; };
B0602A3D1E98F03D0087BBD9 /* StorageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A331E98F03D0087BBD9 /* StorageProvider.swift */; };
B0602A3E1E98F03D0087BBD9 /* FirebaseTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A341E98F03D0087BBD9 /* FirebaseTarget.swift */; };
B0602A3F1E98F03D0087BBD9 /* FirebaseTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A351E98F03D0087BBD9 /* FirebaseTask.swift */; };
B0602A401E98F03D0087BBD9 /* DatabaseRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A361E98F03D0087BBD9 /* DatabaseRequest.swift */; };
B0602A411E98F03D0087BBD9 /* DatabaseResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A371E98F03D0087BBD9 /* DatabaseResponse.swift */; };
B0602A421E98F03D0087BBD9 /* StorageRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A381E98F03D0087BBD9 /* StorageRequest.swift */; };
B0602A431E98F03D0087BBD9 /* StorageResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A391E98F03D0087BBD9 /* StorageResponse.swift */; };
5EEE0EF9DCC621A96DA83B9D /* Pods_NoraTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C9D2F34406916531BC82016 /* Pods_NoraTests.framework */; };
B0602A3C1E98F03D0087BBD9 /* NRDatabaseProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A321E98F03D0087BBD9 /* NRDatabaseProvider.swift */; };
B0602A3D1E98F03D0087BBD9 /* NRStorageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A331E98F03D0087BBD9 /* NRStorageProvider.swift */; };
B0602A3E1E98F03D0087BBD9 /* NRFirebaseTarget.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A341E98F03D0087BBD9 /* NRFirebaseTarget.swift */; };
B0602A3F1E98F03D0087BBD9 /* NRFirebaseTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A351E98F03D0087BBD9 /* NRFirebaseTask.swift */; };
B0602A401E98F03D0087BBD9 /* NRDatabaseRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A361E98F03D0087BBD9 /* NRDatabaseRequest.swift */; };
B0602A411E98F03D0087BBD9 /* NRDatabaseResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A371E98F03D0087BBD9 /* NRDatabaseResponse.swift */; };
B0602A421E98F03D0087BBD9 /* NRStorageRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A381E98F03D0087BBD9 /* NRStorageRequest.swift */; };
B0602A431E98F03D0087BBD9 /* NRStorageResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A391E98F03D0087BBD9 /* NRStorageResponse.swift */; };
B0602A441E98F03D0087BBD9 /* Result.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A3A1E98F03D0087BBD9 /* Result.swift */; };
B0602A451E98F03D0087BBD9 /* NoraError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A3B1E98F03D0087BBD9 /* NoraError.swift */; };
B0602A451E98F03D0087BBD9 /* NRError.swift in Sources */ = {isa = PBXBuildFile; fileRef = B0602A3B1E98F03D0087BBD9 /* NRError.swift */; };
B062C6E01E946B59006C3CB8 /* Nora.h in Headers */ = {isa = PBXBuildFile; fileRef = B062C6D21E946B59006C3CB8 /* Nora.h */; settings = {ATTRIBUTES = (Public, ); }; };
/* End PBXBuildFile section */

Expand All @@ -41,16 +42,16 @@
2A493DF63E18ED29F60987EC /* Pods-NoraTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoraTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-NoraTests/Pods-NoraTests.debug.xcconfig"; sourceTree = "<group>"; };
47BBF9BAF2B1F6B0AE961F4B /* Pods-NoraTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoraTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-NoraTests/Pods-NoraTests.release.xcconfig"; sourceTree = "<group>"; };
5C9D2F34406916531BC82016 /* Pods_NoraTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NoraTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B0602A321E98F03D0087BBD9 /* DatabaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseProvider.swift; sourceTree = "<group>"; };
B0602A331E98F03D0087BBD9 /* StorageProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageProvider.swift; sourceTree = "<group>"; };
B0602A341E98F03D0087BBD9 /* FirebaseTarget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirebaseTarget.swift; sourceTree = "<group>"; };
B0602A351E98F03D0087BBD9 /* FirebaseTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FirebaseTask.swift; sourceTree = "<group>"; };
B0602A361E98F03D0087BBD9 /* DatabaseRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseRequest.swift; sourceTree = "<group>"; };
B0602A371E98F03D0087BBD9 /* DatabaseResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DatabaseResponse.swift; sourceTree = "<group>"; };
B0602A381E98F03D0087BBD9 /* StorageRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageRequest.swift; sourceTree = "<group>"; };
B0602A391E98F03D0087BBD9 /* StorageResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = StorageResponse.swift; sourceTree = "<group>"; };
B0602A321E98F03D0087BBD9 /* NRDatabaseProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRDatabaseProvider.swift; sourceTree = "<group>"; };
B0602A331E98F03D0087BBD9 /* NRStorageProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRStorageProvider.swift; sourceTree = "<group>"; };
B0602A341E98F03D0087BBD9 /* NRFirebaseTarget.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRFirebaseTarget.swift; sourceTree = "<group>"; };
B0602A351E98F03D0087BBD9 /* NRFirebaseTask.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRFirebaseTask.swift; sourceTree = "<group>"; };
B0602A361E98F03D0087BBD9 /* NRDatabaseRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRDatabaseRequest.swift; sourceTree = "<group>"; };
B0602A371E98F03D0087BBD9 /* NRDatabaseResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRDatabaseResponse.swift; sourceTree = "<group>"; };
B0602A381E98F03D0087BBD9 /* NRStorageRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRStorageRequest.swift; sourceTree = "<group>"; };
B0602A391E98F03D0087BBD9 /* NRStorageResponse.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRStorageResponse.swift; sourceTree = "<group>"; };
B0602A3A1E98F03D0087BBD9 /* Result.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Result.swift; sourceTree = "<group>"; };
B0602A3B1E98F03D0087BBD9 /* NoraError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoraError.swift; sourceTree = "<group>"; };
B0602A3B1E98F03D0087BBD9 /* NRError.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NRError.swift; sourceTree = "<group>"; };
B062C6CF1E946B59006C3CB8 /* Nora.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Nora.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B062C6D21E946B59006C3CB8 /* Nora.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Nora.h; sourceTree = "<group>"; };
B062C6D31E946B59006C3CB8 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
Expand All @@ -64,6 +65,7 @@
buildActionMask = 2147483647;
files = (
07E554321E96B33C00D81D9B /* Nora.framework in Frameworks */,
5EEE0EF9DCC621A96DA83B9D /* Pods_NoraTests.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -130,16 +132,16 @@
B062C7091E947363006C3CB8 /* Sources */ = {
isa = PBXGroup;
children = (
B0602A321E98F03D0087BBD9 /* DatabaseProvider.swift */,
B0602A331E98F03D0087BBD9 /* StorageProvider.swift */,
B0602A341E98F03D0087BBD9 /* FirebaseTarget.swift */,
B0602A351E98F03D0087BBD9 /* FirebaseTask.swift */,
B0602A361E98F03D0087BBD9 /* DatabaseRequest.swift */,
B0602A371E98F03D0087BBD9 /* DatabaseResponse.swift */,
B0602A381E98F03D0087BBD9 /* StorageRequest.swift */,
B0602A391E98F03D0087BBD9 /* StorageResponse.swift */,
B0602A321E98F03D0087BBD9 /* NRDatabaseProvider.swift */,
B0602A361E98F03D0087BBD9 /* NRDatabaseRequest.swift */,
B0602A371E98F03D0087BBD9 /* NRDatabaseResponse.swift */,
B0602A3B1E98F03D0087BBD9 /* NRError.swift */,
B0602A341E98F03D0087BBD9 /* NRFirebaseTarget.swift */,
B0602A351E98F03D0087BBD9 /* NRFirebaseTask.swift */,
B0602A331E98F03D0087BBD9 /* NRStorageProvider.swift */,
B0602A381E98F03D0087BBD9 /* NRStorageRequest.swift */,
B0602A391E98F03D0087BBD9 /* NRStorageResponse.swift */,
B0602A3A1E98F03D0087BBD9 /* Result.swift */,
B0602A3B1E98F03D0087BBD9 /* NoraError.swift */,
);
name = Sources;
sourceTree = "<group>";
Expand Down Expand Up @@ -180,9 +182,12 @@
isa = PBXNativeTarget;
buildConfigurationList = 07E554351E96B33C00D81D9B /* Build configuration list for PBXNativeTarget "NoraTests" */;
buildPhases = (
0202CAFEA2255C9DD2D3A7D4 /* [CP] Check Pods Manifest.lock */,
07E554291E96B33C00D81D9B /* Sources */,
07E5542A1E96B33C00D81D9B /* Frameworks */,
07E5542B1E96B33C00D81D9B /* Resources */,
68C85674EC1096FBEFBC84FD /* [CP] Embed Pods Frameworks */,
FBEB84AFADCE47AA173184FD /* [CP] Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -271,6 +276,21 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
0202CAFEA2255C9DD2D3A7D4 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
13DE7064A13522BE8F888D5E /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -286,6 +306,21 @@
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Nora/Pods-Nora-resources.sh\"\n";
showEnvVarsInLog = 0;
};
68C85674EC1096FBEFBC84FD /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NoraTests/Pods-NoraTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
FBCC640E56FFA5B96C1BF198 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -298,7 +333,22 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
FBEB84AFADCE47AA173184FD /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "[CP] Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NoraTests/Pods-NoraTests-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand All @@ -317,15 +367,15 @@
buildActionMask = 2147483647;
files = (
B0602A441E98F03D0087BBD9 /* Result.swift in Sources */,
B0602A421E98F03D0087BBD9 /* StorageRequest.swift in Sources */,
B0602A3D1E98F03D0087BBD9 /* StorageProvider.swift in Sources */,
B0602A411E98F03D0087BBD9 /* DatabaseResponse.swift in Sources */,
B0602A3F1E98F03D0087BBD9 /* FirebaseTask.swift in Sources */,
B0602A431E98F03D0087BBD9 /* StorageResponse.swift in Sources */,
B0602A3C1E98F03D0087BBD9 /* DatabaseProvider.swift in Sources */,
B0602A3E1E98F03D0087BBD9 /* FirebaseTarget.swift in Sources */,
B0602A451E98F03D0087BBD9 /* NoraError.swift in Sources */,
B0602A401E98F03D0087BBD9 /* DatabaseRequest.swift in Sources */,
B0602A421E98F03D0087BBD9 /* NRStorageRequest.swift in Sources */,
B0602A3D1E98F03D0087BBD9 /* NRStorageProvider.swift in Sources */,
B0602A411E98F03D0087BBD9 /* NRDatabaseResponse.swift in Sources */,
B0602A3F1E98F03D0087BBD9 /* NRFirebaseTask.swift in Sources */,
B0602A431E98F03D0087BBD9 /* NRStorageResponse.swift in Sources */,
B0602A3C1E98F03D0087BBD9 /* NRDatabaseProvider.swift in Sources */,
B0602A3E1E98F03D0087BBD9 /* NRFirebaseTarget.swift in Sources */,
B0602A451E98F03D0087BBD9 /* NRError.swift in Sources */,
B0602A401E98F03D0087BBD9 /* NRDatabaseRequest.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -342,6 +392,7 @@
/* Begin XCBuildConfiguration section */
07E554361E96B33C00D81D9B /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2A493DF63E18ED29F60987EC /* Pods-NoraTests.debug.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand All @@ -356,6 +407,7 @@
};
07E554371E96B33C00D81D9B /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 47BBF9BAF2B1F6B0AE961F4B /* Pods-NoraTests.release.xcconfig */;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
Expand Down
Loading

0 comments on commit 0991362

Please sign in to comment.