diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b521ae3e5..cd9a196ccd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,11 @@ x.x.x Release notes (yyyy-MM-dd) * Throw an exception when a class subset has objects with array or object properties of a type that are not part of the class subset. +0.95.3 Release notes (2015-10-02) +============================================================= + +* Compile iOS Simulator framework architectures with `-fembed-bitcode-marker`. + 0.95.2 Release notes (2015-09-24) ============================================================= diff --git a/Realm.podspec b/Realm.podspec index adc6ef14d7..549a0fdc63 100644 --- a/Realm.podspec +++ b/Realm.podspec @@ -44,8 +44,8 @@ Pod::Spec.new do |s| 'OTHER_CPLUSPLUSFLAGS' => '-std=c++1y $(inherited)' } s.preserve_paths = %w(build.sh) - s.ios.deployment_target = '7.0' - s.ios.vendored_library = 'core/librealm-ios.a' + s.ios.deployment_target = '8.0' + s.ios.vendored_library = 'core/librealm-ios-bitcode.a' s.osx.deployment_target = '10.9' s.osx.vendored_library = 'core/librealm-osx.a' diff --git a/Realm.xcodeproj/project.pbxproj b/Realm.xcodeproj/project.pbxproj index 1de8f36420..3f416e5000 100644 --- a/Realm.xcodeproj/project.pbxproj +++ b/Realm.xcodeproj/project.pbxproj @@ -1226,7 +1226,7 @@ buildConfigurationList = 144C2F451B3D33D0005C8F81 /* Build configuration list for PBXNativeTarget "watchOS" */; buildPhases = ( 144C2F591B3D34B1005C8F81 /* Get Version Number */, - 293F98F11A76E05A00C0199D /* Download Core */, + 293F98F11A76E05A00C0199D /* Download Core & Set Bitcode Symlink */, 144C2F391B3D33D0005C8F81 /* Sources */, 144C2F3B1B3D33D0005C8F81 /* Headers */, 148FF9F51BB9A727000C7028 /* Copy Strip Frameworks Script */, @@ -1245,7 +1245,7 @@ buildConfigurationList = 29E3C7371A71C1C700B62C1D /* Build configuration list for PBXNativeTarget "iOS Dynamic" */; buildPhases = ( 293F98F01A76E05700C0199D /* Get Version Number */, - 293F98F11A76E05A00C0199D /* Download Core */, + 293F98F11A76E05A00C0199D /* Download Core & Set Bitcode Symlink */, 29E3C7071A71C1C700B62C1D /* Sources */, 29E3C71A1A71C1C700B62C1D /* Headers */, E81C393F1AE5CE7B00F03B56 /* Copy Strip Frameworks Script */, @@ -1302,7 +1302,7 @@ buildConfigurationList = E856D1E8195614A400FB2FCF /* Build configuration list for PBXNativeTarget "iOS" */; buildPhases = ( 3F69DF9E19CA0DF900607109 /* Get Version Number */, - E856D1EE1956151D00FB2FCF /* Download Core */, + E856D1EE1956151D00FB2FCF /* Download Core & Set Bitcode Symlink */, E856D1D0195614A300FB2FCF /* Sources */, E856D1D2195614A300FB2FCF /* Headers */, ); @@ -1504,19 +1504,19 @@ shellPath = /bin/sh; shellScript = "echo \"#define REALM_COCOA_VERSION @\\\"$(sh build.sh get-version)\\\"\" > ${DERIVED_FILE_DIR}/RLMVersion.h"; }; - 293F98F11A76E05A00C0199D /* Download Core */ = { + 293F98F11A76E05A00C0199D /* Download Core & Set Bitcode Symlink */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Download Core"; + name = "Download Core & Set Bitcode Symlink"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "sh build.sh download-core"; + shellScript = "sh build.sh download-core\nsh build.sh set-core-bitcode-symlink"; }; 3F69DF9E19CA0DF900607109 /* Get Version Number */ = { isa = PBXShellScriptBuildPhase; @@ -1562,19 +1562,19 @@ shellPath = /bin/sh; shellScript = "sh build.sh download-core"; }; - E856D1EE1956151D00FB2FCF /* Download Core */ = { + E856D1EE1956151D00FB2FCF /* Download Core & Set Bitcode Symlink */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( ); inputPaths = ( ); - name = "Download Core"; + name = "Download Core & Set Bitcode Symlink"; outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "sh build.sh download-core"; + shellScript = "sh build.sh download-core\nsh build.sh set-core-bitcode-symlink"; }; E8DFDD901B5EAA3100282424 /* Set Swift Version */ = { isa = PBXShellScriptBuildPhase; diff --git a/build.sh b/build.sh index c60409d9af..9952593a46 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/sh ################################################################################## -# Custom build tool for Realm Objective C binding. +# Custom build tool for Realm Objective-C binding. # # (C) Copyright 2011-2015 by realm.io. ################################################################################## @@ -14,7 +14,7 @@ set -o pipefail set -e # You can override the version of the core library -: ${REALM_CORE_VERSION:=0.92.2} # set to "current" to always use the current build +: ${REALM_CORE_VERSION:=0.92.4} # set to "current" to always use the current build # You can override the xcmode used : ${XCMODE:=xcodebuild} # must be one of: xcodebuild (default), xcpretty, xctool @@ -35,6 +35,7 @@ Usage: sh $0 command [argument] command: clean: clean up/remove all generated files download-core: downloads core library (binary version) + set-core-bitcode-symlink: set core symlink to bitcode version for Xcode 7+ or non-bitcode version otherwise build: builds all iOS and OS X frameworks ios-static: builds fat iOS static framework ios-dynamic: builds iOS dynamic frameworks @@ -278,7 +279,7 @@ case "$COMMAND" in ;; ###################################### - # Download Core Library + # Core ###################################### "download-core") if [ "$REALM_CORE_VERSION" = "current" ]; then @@ -309,6 +310,20 @@ case "$COMMAND" in exit 0 ;; + "set-core-bitcode-symlink") + cd core + rm -f librealm-ios.a librealm-ios-dbg.a + if [ $REALM_SWIFT_VERSION = '1.2' ]; then + echo "Using core without bitcode" + ln -s librealm-ios-no-bitcode.a librealm-ios.a + ln -s librealm-ios-no-bitcode-dbg.a librealm-ios-dbg.a + else + echo "Using core with bitcode" + ln -s librealm-ios-bitcode.a librealm-ios.a + ln -s librealm-ios-bitcode-dbg.a librealm-ios-dbg.a + fi + ;; + ###################################### # Swift versioning ######################################