Skip to content

Commit

Permalink
Update installation examples to use the xcframework
Browse files Browse the repository at this point in the history
  • Loading branch information
@tgoyne
tgoyne committed Nov 30, 2020
1 parent c5dc9b8 commit f69ee0a
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 61 deletions.
2 changes: 1 addition & 1 deletion examples/installation/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ xctest() {
local scheme=(-scheme "$NAME")

# Ensure that dynamic framework tests try to use the correct version of the prebuilt libraries.
sed -i '' 's@/swift-[0-9.]*@/swift-'"${REALM_XCODE_VERSION}"'@' "$DIRECTORY/$NAME.xcodeproj/project.pbxproj"
sed -i '' 's@/realm-swift-latest@/realm-swift-latest/'"${REALM_XCODE_VERSION}"'@' "$DIRECTORY/$NAME.xcodeproj/project.pbxproj"

xcodebuild "${project[@]}" "${scheme[@]}" clean build "${destination[@]}" "${code_signing_flags[@]}"
if [[ $PLATFORM != watchos ]]; then
Expand Down
12 changes: 6 additions & 6 deletions examples/installation/ios/objc/DynamicExample/DynamicExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
E8561ACE1AFB1518006E087E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8561ACD1AFB1518006E087E /* Images.xcassets */; };
E8561AD11AFB1518006E087E /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = E8561ACF1AFB1518006E087E /* LaunchScreen.xib */; };
E8561ADD1AFB1518006E087E /* DynamicExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E8561ADC1AFB1518006E087E /* DynamicExampleTests.m */; };
E8561AE71AFB1534006E087E /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8561AE61AFB1534006E087E /* Realm.framework */; };
E8561AE81AFB1534006E087E /* Realm.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E8561AE61AFB1534006E087E /* Realm.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E8561AE71AFB1534006E087E /* Realm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8561AE61AFB1534006E087E /* Realm.xcframework */; };
E8561AE81AFB1534006E087E /* Realm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E8561AE61AFB1534006E087E /* Realm.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -35,7 +35,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
E8561AE81AFB1534006E087E /* Realm.framework in Embed Frameworks */,
E8561AE81AFB1534006E087E /* Realm.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -56,15 +56,15 @@
E8561AD61AFB1518006E087E /* DynamicExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DynamicExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E8561ADB1AFB1518006E087E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E8561ADC1AFB1518006E087E /* DynamicExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DynamicExampleTests.m; sourceTree = "<group>"; };
E8561AE61AFB1534006E087E /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = "../../../realm-objc-latest/ios/dynamic/Realm.framework"; sourceTree = "<group>"; };
E8561AE61AFB1534006E087E /* Realm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Realm.xcframework; path = "../../../realm-objc-latest/Realm.xcframework"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
E8561ABA1AFB1518006E087E /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E8561AE71AFB1534006E087E /* Realm.framework in Frameworks */,
E8561AE71AFB1534006E087E /* Realm.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -84,7 +84,7 @@
E8561ABF1AFB1518006E087E /* DynamicExample */,
E8561AD91AFB1518006E087E /* DynamicExampleTests */,
E8561ABE1AFB1518006E087E /* Products */,
E8561AE61AFB1534006E087E /* Realm.framework */,
E8561AE61AFB1534006E087E /* Realm.xcframework */,
);
sourceTree = "<group>";
};
Expand Down
12 changes: 6 additions & 6 deletions examples/installation/ios/objc/StaticExample/StaticExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
E85A7EEC1AFAAFBF005C839C /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E88ABBDA1AFAA5D600FA1E1D /* Realm.framework */; };
E85A7EEC1AFAAFBF005C839C /* Realm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E88ABBDA1AFAA5D600FA1E1D /* Realm.xcframework */; };
E85A7EED1AFAAFC2005C839C /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E88ABBDC1AFAA5E000FA1E1D /* libc++.dylib */; };
E88ABBB51AFA9DE300FA1E1D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E88ABBB41AFA9DE300FA1E1D /* main.m */; };
E88ABBB81AFA9DE300FA1E1D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = E88ABBB71AFA9DE300FA1E1D /* AppDelegate.m */; };
Expand All @@ -16,7 +16,7 @@
E88ABBC01AFA9DE300FA1E1D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E88ABBBF1AFA9DE300FA1E1D /* Images.xcassets */; };
E88ABBC31AFA9DE300FA1E1D /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = E88ABBC11AFA9DE300FA1E1D /* LaunchScreen.xib */; };
E88ABBCF1AFA9DE400FA1E1D /* StaticExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E88ABBCE1AFA9DE400FA1E1D /* StaticExampleTests.m */; };
E88ABBDB1AFAA5D600FA1E1D /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E88ABBDA1AFAA5D600FA1E1D /* Realm.framework */; };
E88ABBDB1AFAA5D600FA1E1D /* Realm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E88ABBDA1AFAA5D600FA1E1D /* Realm.xcframework */; };
E88ABBDD1AFAA5E000FA1E1D /* libc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = E88ABBDC1AFAA5E000FA1E1D /* libc++.dylib */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -44,7 +44,7 @@
E88ABBC81AFA9DE400FA1E1D /* StaticExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StaticExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E88ABBCD1AFA9DE400FA1E1D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E88ABBCE1AFA9DE400FA1E1D /* StaticExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = StaticExampleTests.m; sourceTree = "<group>"; };
E88ABBDA1AFAA5D600FA1E1D /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = "../../../realm-objc-latest/ios/static/Realm.framework"; sourceTree = "<group>"; };
E88ABBDA1AFAA5D600FA1E1D /* Realm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Realm.xcframework; path = "../../../realm-objc-latest/ios-static/Realm.xcframework"; sourceTree = "<group>"; };
E88ABBDC1AFAA5E000FA1E1D /* libc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libc++.dylib"; path = "usr/lib/libc++.dylib"; sourceTree = SDKROOT; };
/* End PBXFileReference section */

Expand All @@ -54,7 +54,7 @@
buildActionMask = 2147483647;
files = (
E88ABBDD1AFAA5E000FA1E1D /* libc++.dylib in Frameworks */,
E88ABBDB1AFAA5D600FA1E1D /* Realm.framework in Frameworks */,
E88ABBDB1AFAA5D600FA1E1D /* Realm.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -63,7 +63,7 @@
buildActionMask = 2147483647;
files = (
E85A7EED1AFAAFC2005C839C /* libc++.dylib in Frameworks */,
E85A7EEC1AFAAFBF005C839C /* Realm.framework in Frameworks */,
E85A7EEC1AFAAFBF005C839C /* Realm.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -77,7 +77,7 @@
E88ABBB11AFA9DE300FA1E1D /* StaticExample */,
E88ABBCB1AFA9DE400FA1E1D /* StaticExampleTests */,
E88ABBDC1AFAA5E000FA1E1D /* libc++.dylib */,
E88ABBDA1AFAA5D600FA1E1D /* Realm.framework */,
E88ABBDA1AFAA5D600FA1E1D /* Realm.xcframework */,
);
sourceTree = "<group>";
};
Expand Down
24 changes: 12 additions & 12 deletions examples/installation/ios/swift/DynamicExample/DynamicExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
objects = {

/* Begin PBXBuildFile section */
C07E5D871B15083F00ED625C /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C07E5D861B15083F00ED625C /* Realm.framework */; };
C07E5D891B15084800ED625C /* Realm.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C07E5D861B15083F00ED625C /* Realm.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E8AD59E61AFAB62100E79784 /* RealmSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8AD59E51AFAB62100E79784 /* RealmSwift.framework */; };
E8AD59E71AFAB62100E79784 /* RealmSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E8AD59E51AFAB62100E79784 /* RealmSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
C07E5D871B15083F00ED625C /* Realm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = C07E5D861B15083F00ED625C /* Realm.xcframework */; };
C07E5D891B15084800ED625C /* Realm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C07E5D861B15083F00ED625C /* Realm.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E8AD59E61AFAB62100E79784 /* RealmSwift.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8AD59E51AFAB62100E79784 /* RealmSwift.xcframework */; };
E8AD59E71AFAB62100E79784 /* RealmSwift.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E8AD59E51AFAB62100E79784 /* RealmSwift.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E8E060C11AFAB5EB00484DEE /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8E060C01AFAB5EB00484DEE /* AppDelegate.swift */; };
E8E060C31AFAB5EB00484DEE /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E8E060C21AFAB5EB00484DEE /* ViewController.swift */; };
E8E060C61AFAB5EB00484DEE /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8E060C41AFAB5EB00484DEE /* Main.storyboard */; };
Expand All @@ -36,17 +36,17 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
C07E5D891B15084800ED625C /* Realm.framework in Embed Frameworks */,
E8AD59E71AFAB62100E79784 /* RealmSwift.framework in Embed Frameworks */,
C07E5D891B15084800ED625C /* Realm.xcframework in Embed Frameworks */,
E8AD59E71AFAB62100E79784 /* RealmSwift.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
C07E5D861B15083F00ED625C /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = "../../../realm-swift-latest/ios/swift-11.3/Realm.framework"; sourceTree = "<group>"; };
E8AD59E51AFAB62100E79784 /* RealmSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RealmSwift.framework; path = "../../../realm-swift-latest/ios/swift-11.3/RealmSwift.framework"; sourceTree = "<group>"; };
C07E5D861B15083F00ED625C /* Realm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Realm.xcframework; path = "../../../realm-swift-latest/Realm.xcframework"; sourceTree = "<group>"; };
E8AD59E51AFAB62100E79784 /* RealmSwift.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = RealmSwift.xcframework; path = "../../../realm-swift-latest/RealmSwift.xcframework"; sourceTree = "<group>"; };
E8E060BB1AFAB5EB00484DEE /* DynamicExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DynamicExample.app; sourceTree = BUILT_PRODUCTS_DIR; };
E8E060BF1AFAB5EB00484DEE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E8E060C01AFAB5EB00484DEE /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
Expand All @@ -64,8 +64,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
C07E5D871B15083F00ED625C /* Realm.framework in Frameworks */,
E8AD59E61AFAB62100E79784 /* RealmSwift.framework in Frameworks */,
C07E5D871B15083F00ED625C /* Realm.xcframework in Frameworks */,
E8AD59E61AFAB62100E79784 /* RealmSwift.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -85,8 +85,8 @@
E8E060BD1AFAB5EB00484DEE /* DynamicExample */,
E8E060D31AFAB5EB00484DEE /* DynamicExampleTests */,
E8E060BC1AFAB5EB00484DEE /* Products */,
C07E5D861B15083F00ED625C /* Realm.framework */,
E8AD59E51AFAB62100E79784 /* RealmSwift.framework */,
C07E5D861B15083F00ED625C /* Realm.xcframework */,
E8AD59E51AFAB62100E79784 /* RealmSwift.xcframework */,
);
sourceTree = "<group>";
};
Expand Down
12 changes: 6 additions & 6 deletions examples/installation/osx/objc/DynamicExample/DynamicExample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
E8358B6B1AFB172C00DE7F8C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E8358B6A1AFB172C00DE7F8C /* Images.xcassets */; };
E8358B6E1AFB172C00DE7F8C /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = E8358B6C1AFB172C00DE7F8C /* Main.storyboard */; };
E8358B7A1AFB172C00DE7F8C /* DynamicExampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = E8358B791AFB172C00DE7F8C /* DynamicExampleTests.m */; };
E8358B841AFB174600DE7F8C /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8358B831AFB174600DE7F8C /* Realm.framework */; };
E8358B851AFB174600DE7F8C /* Realm.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E8358B831AFB174600DE7F8C /* Realm.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
E8358B841AFB174600DE7F8C /* Realm.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = E8358B831AFB174600DE7F8C /* Realm.xcframework */; };
E8358B851AFB174600DE7F8C /* Realm.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = E8358B831AFB174600DE7F8C /* Realm.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -34,7 +34,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
E8358B851AFB174600DE7F8C /* Realm.framework in Embed Frameworks */,
E8358B851AFB174600DE7F8C /* Realm.xcframework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -54,15 +54,15 @@
E8358B731AFB172C00DE7F8C /* DynamicExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = DynamicExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
E8358B781AFB172C00DE7F8C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
E8358B791AFB172C00DE7F8C /* DynamicExampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DynamicExampleTests.m; sourceTree = "<group>"; };
E8358B831AFB174600DE7F8C /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Realm.framework; path = "../../../realm-objc-latest/osx/Realm.framework"; sourceTree = "<group>"; };
E8358B831AFB174600DE7F8C /* Realm.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Realm.xcframework; path = "../../../realm-objc-latest/Realm.xcframework"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
E8358B5A1AFB172C00DE7F8C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
E8358B841AFB174600DE7F8C /* Realm.framework in Frameworks */,
E8358B841AFB174600DE7F8C /* Realm.xcframework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -82,7 +82,7 @@
E8358B5F1AFB172C00DE7F8C /* DynamicExample */,
E8358B761AFB172C00DE7F8C /* DynamicExampleTests */,
E8358B5E1AFB172C00DE7F8C /* Products */,
E8358B831AFB174600DE7F8C /* Realm.framework */,
E8358B831AFB174600DE7F8C /* Realm.xcframework */,
);
sourceTree = "<group>";
};
Expand Down

0 comments on commit f69ee0a

Please sign in to comment.