Skip to content
This repository has been archived by the owner on Nov 8, 2021. It is now read-only.

Commit

Permalink
Merge pull request #345 from realm/master-3.0
Browse files Browse the repository at this point in the history
Realm Browser 3.0
  • Loading branch information
tgoyne committed Oct 17, 2017
2 parents 4942478 + bba8d1f commit fea829c
Show file tree
Hide file tree
Showing 24 changed files with 537 additions and 382 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,7 @@
3.0.0 Release notes (2017-10-16)
=============================================================
* Update to Realm 3.0.0.

2.1.12 Release notes (2017-07-27)
=============================================================
* Update to Realm 2.9.0 that fixes an issue connecting to multiple servers with the same user.
Expand Down
12 changes: 10 additions & 2 deletions Podfile
Expand Up @@ -5,12 +5,20 @@ use_frameworks!

target 'RealmBrowser' do
pod 'AppSandboxFileAccess'
pod 'Realm'
pod 'RealmConverter'
pod 'Realm', '~> 3.0.0'
pod 'RealmConverter', '~> 0.5.0'
pod 'HockeySDK-Mac'

target 'RealmBrowserTests' do
# It looks like that inheritance via search paths is still broken with frameworks, see https://github.com/CocoaPods/CocoaPods/issues/4944
# inherit! :search_paths
end
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '3.0'
end
end
end
32 changes: 16 additions & 16 deletions Podfile.lock
@@ -1,37 +1,37 @@
PODS:
- AppSandboxFileAccess (1.0.14)
- CSwiftV (0.0.7)
- HockeySDK-Mac (4.1.4)
- HockeySDK-Mac (5.0.0)
- PathKit (0.8.0)
- Realm (2.9.0):
- Realm/Headers (= 2.9.0)
- Realm/Headers (2.9.0)
- RealmConverter (0.4.1):
- Realm (3.0.0):
- Realm/Headers (= 3.0.0)
- Realm/Headers (3.0.0)
- RealmConverter (0.5.0):
- CSwiftV
- PathKit
- Realm
- Realm (~> 3.0.0-rc.1)
- SSZipArchive
- TGSpreadsheetWriter
- SSZipArchive (2.0.2)
- SSZipArchive (2.1.1)
- TGSpreadsheetWriter (1.0.2):
- SSZipArchive

DEPENDENCIES:
- AppSandboxFileAccess
- HockeySDK-Mac
- Realm
- RealmConverter
- Realm (~> 3.0.0)
- RealmConverter (~> 0.5.0)

SPEC CHECKSUMS:
AppSandboxFileAccess: f3e10b0ba10bbaa6dc6996639ff47836050329c5
CSwiftV: 602a0cb1df5f758d6005eacb6472c9bc752a7e7c
HockeySDK-Mac: 963ce83ffcbc0e0297a63d2a4fc4d84c103f9280
HockeySDK-Mac: df7b77c3abd970933cd6eb270890931e0bdcbecb
PathKit: dcab05d701474011aae0e40cf892298a831f63d6
Realm: f14ab1673502559cb16592ddb8f383c474c13e05
RealmConverter: ea2c483fa5a584eb58e409cf6615808dd86a8dcc
SSZipArchive: 5fdf578dbbb60000b23439f80fa04e81d00740ee
TGSpreadsheetWriter: '09bbb2c18a111a11c94ff9c1af2320e2530c958e'
Realm: dec0de73be8c57506e39db72694d513c189493b3
RealmConverter: 6ed3e229fc2ff2f7527ae13ea2dc4b61af81fc67
SSZipArchive: 14401ade5f8e82aba1ff03e9f88e9de60937ae60
TGSpreadsheetWriter: 09bbb2c18a111a11c94ff9c1af2320e2530c958e

PODFILE CHECKSUM: 5cd2a5d1718f788c14393e563ba2ae374f258424
PODFILE CHECKSUM: 9f70ee7997fbea9181f6bd22c07090d45f2f70b1

COCOAPODS: 1.2.1
COCOAPODS: 1.3.1
58 changes: 54 additions & 4 deletions RealmBrowser.xcodeproj/project.pbxproj
Expand Up @@ -771,13 +771,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-RealmBrowser-checkManifestLockResult.txt",
);
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";
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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
17F608046AD67CB7E4F89028 /* [CP] Check Pods Manifest.lock */ = {
Expand All @@ -786,13 +789,16 @@
files = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-RealmBrowser-RealmBrowserTests-checkManifestLockResult.txt",
);
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";
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# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
23AE60F23DDCF9B53FC5CA2A /* [CP] Embed Pods Frameworks */ = {
Expand All @@ -801,9 +807,28 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-RealmBrowser/Pods-RealmBrowser-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AppSandboxFileAccess/AppSandboxFileAccess.framework",
"${BUILT_PRODUCTS_DIR}/CSwiftV/CSwiftV.framework",
"${PODS_ROOT}/HockeySDK-Mac/HockeySDK-Mac/HockeySDK.framework",
"${PODS_ROOT}/HockeySDK-Mac/HockeySDK-Mac/HockeySDK.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/PathKit/PathKit.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmConverter/RealmConverter.framework",
"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
"${BUILT_PRODUCTS_DIR}/TGSpreadsheetWriter/TGSpreadsheetWriter.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppSandboxFileAccess.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CSwiftV.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK.framework",
"${DWARF_DSYM_FOLDER_PATH}/HockeySDK.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PathKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmConverter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TGSpreadsheetWriter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -816,9 +841,28 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-RealmBrowser-RealmBrowserTests/Pods-RealmBrowser-RealmBrowserTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/AppSandboxFileAccess/AppSandboxFileAccess.framework",
"${BUILT_PRODUCTS_DIR}/CSwiftV/CSwiftV.framework",
"${PODS_ROOT}/HockeySDK-Mac/HockeySDK-Mac/HockeySDK.framework",
"${PODS_ROOT}/HockeySDK-Mac/HockeySDK-Mac/HockeySDK.framework.dSYM",
"${BUILT_PRODUCTS_DIR}/PathKit/PathKit.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmConverter/RealmConverter.framework",
"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
"${BUILT_PRODUCTS_DIR}/TGSpreadsheetWriter/TGSpreadsheetWriter.framework",
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppSandboxFileAccess.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CSwiftV.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/HockeySDK.framework",
"${DWARF_DSYM_FOLDER_PATH}/HockeySDK.framework.dSYM",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PathKit.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmConverter.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TGSpreadsheetWriter.framework",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -831,9 +875,12 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-RealmBrowser-RealmBrowserTests/Pods-RealmBrowser-RealmBrowserTests-resources.sh",
"${PODS_ROOT}/HockeySDK-Mac/HockeySDK-Mac/HockeySDK.framework",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand All @@ -846,9 +893,12 @@
files = (
);
inputPaths = (
"${SRCROOT}/Pods/Target Support Files/Pods-RealmBrowser/Pods-RealmBrowser-resources.sh",
"${PODS_ROOT}/HockeySDK-Mac/HockeySDK-Mac/HockeySDK.framework",
);
name = "[CP] Copy Pods Resources";
outputPaths = (
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -1100,7 +1150,7 @@
CODE_SIGN_ENTITLEMENTS = "RealmBrowser/Supporting Files/Realm Browser.entitlements";
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 96;
CURRENT_PROJECT_VERSION = 97;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RealmBrowser/Supporting Files/RealmBrowser-Prefix.pch";
Expand Down Expand Up @@ -1132,7 +1182,7 @@
CODE_SIGN_ENTITLEMENTS = "RealmBrowser/Supporting Files/Realm Browser.entitlements";
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 96;
CURRENT_PROJECT_VERSION = 97;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "RealmBrowser/Supporting Files/RealmBrowser-Prefix.pch";
Expand Down
1 change: 0 additions & 1 deletion RealmBrowser/Application/RLMApplicationDelegate.m
Expand Up @@ -80,7 +80,6 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification {

[self logOutSyncUsers];

[RLMSyncManager sharedManager].disableSSLValidation = YES;
[RLMSyncManager sharedManager].errorHandler = ^(NSError *error, RLMSyncSession *session) {
[NSApp presentError:error];
};
Expand Down

0 comments on commit fea829c

Please sign in to comment.