diff --git a/CHANGELOG.md b/CHANGELOG.md index a2ca0bab..278c3900 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +x.x.x Release notes (yyyy-MM-dd) +============================================================= +### Breaking changes +* None + +### Enhancements +* None + +### Bugfixes +* Fix linker error when building for minimum target version of iOS 7. + 0.14.0 Release notes (2016-6-22) ============================================================= ### Breaking changes diff --git a/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj b/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj index a30457bb..e58be9a9 100644 --- a/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj +++ b/examples/ReactExample/ios/ReactExample.xcodeproj/project.pbxproj @@ -752,7 +752,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; @@ -793,7 +793,7 @@ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include, "$(SRCROOT)/../node_modules/react-native/React/**", ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; SDKROOT = iphoneos; diff --git a/react-native/ios/RealmReact.xcodeproj/project.pbxproj b/react-native/ios/RealmReact.xcodeproj/project.pbxproj index 1df0816d..708df929 100644 --- a/react-native/ios/RealmReact.xcodeproj/project.pbxproj +++ b/react-native/ios/RealmReact.xcodeproj/project.pbxproj @@ -13,13 +13,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - F606902C1CA277CD0003FB26 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = F63FF2F01C16405C00B3B8E0; - remoteInfo = GCDWebServers; - }; F606902E1CA277CD0003FB26 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; @@ -48,6 +41,20 @@ remoteGlobalIDString = F63FF2EF1C16405C00B3B8E0; remoteInfo = GCDWebServers; }; + F68759FA1D21949A007471AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F63FF2F01C16405C00B3B8E0; + remoteInfo = GCDWebServers; + }; + F68759FC1D21949A007471AB /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = F60690231CA277CC0003FB26 /* RealmJS.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = F62BF8FB1CAC71780022BCDC; + remoteInfo = RealmNode; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -113,7 +120,9 @@ F60690241CA277CC0003FB26 /* Products */ = { isa = PBXGroup; children = ( + F68759FB1D21949A007471AB /* libGCDWebServers.a */, F606902F1CA277CD0003FB26 /* libRealmJS.a */, + F68759FD1D21949A007471AB /* libRealmNode.dylib */, F60690331CA277CD0003FB26 /* RealmJSTests.xctest */, ); name = Products; @@ -192,6 +201,20 @@ remoteRef = F60690321CA277CD0003FB26 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + F68759FB1D21949A007471AB /* libGCDWebServers.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libGCDWebServers.a; + remoteRef = F68759FA1D21949A007471AB /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + F68759FD1D21949A007471AB /* libRealmNode.dylib */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.dylib"; + path = libRealmNode.dylib; + remoteRef = F68759FC1D21949A007471AB /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXSourcesBuildPhase section */ @@ -256,7 +279,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = ( @@ -298,7 +321,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", diff --git a/src/RealmJS.xcodeproj/project.pbxproj b/src/RealmJS.xcodeproj/project.pbxproj index b610b327..ee19823d 100644 --- a/src/RealmJS.xcodeproj/project.pbxproj +++ b/src/RealmJS.xcodeproj/project.pbxproj @@ -951,7 +951,7 @@ "$(SRCROOT)/object-store/src", "$(SRCROOT)/../vendor", ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = ( @@ -1006,7 +1006,7 @@ "$(SRCROOT)/object-store/src", "$(SRCROOT)/../vendor", ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_CPLUSPLUSFLAGS = ( "$(OTHER_CFLAGS)", diff --git a/src/object-store/src/util/thread_local.hpp b/src/object-store/src/util/thread_local.hpp index 48ed6ca9..ba1dd499 100644 --- a/src/object-store/src/util/thread_local.hpp +++ b/src/object-store/src/util/thread_local.hpp @@ -21,7 +21,8 @@ #include -#if !defined(__clang__) || REALM_HAVE_CLANG_FEATURE(tls) || REALM_HAVE_CLANG_FEATURE(cxx_thread_local) +#if (!defined(__clang__) || REALM_HAVE_CLANG_FEATURE(tls) || REALM_HAVE_CLANG_FEATURE(cxx_thread_local)) && \ + (!REALM_PLATFORM_APPLE || __IPHONE_OS_VERSION_MIN_REQUIRED >= 80000 || MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) #define REALM_THREAD_LOCAL_TYPE(type) REALM_THREAD_LOCAL type diff --git a/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj b/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj index 2bbf4003..3bfd2f29 100644 --- a/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj +++ b/tests/react-test-app/ios/ReactTests.xcodeproj/project.pbxproj @@ -741,7 +741,7 @@ "$(SRCROOT)/../node_modules/react-native/React/Base/**", "$(SRCROOT)/../node_modules/react-native/React/Modules", ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; @@ -783,7 +783,7 @@ "$(SRCROOT)/../node_modules/react-native/React/Base/**", "$(SRCROOT)/../node_modules/react-native/React/Modules", ); - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 7.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "io.realm.$(PRODUCT_NAME:rfc1034identifier)"; SDKROOT = iphoneos;