Skip to content

Commit

Permalink
Updated Realm version (to 0.98.6) to support OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
danielgindi committed Mar 31, 2016
1 parent a18da15 commit 2da8db0
Show file tree
Hide file tree
Showing 128 changed files with 41,439 additions and 27,634 deletions.
171 changes: 169 additions & 2 deletions ChartsRealm/ChartsRealm.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,29 @@
5B88D8A71C634EBB00B54CBD /* RealmScatterDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8841C634EBB00B54CBD /* RealmScatterDataSet.swift */; };
5B88D8A81C634EBB00B54CBD /* RealmScatterDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8841C634EBB00B54CBD /* RealmScatterDataSet.swift */; };
5B88D8B51C63504200B54CBD /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B88D8B01C63502500B54CBD /* Charts.framework */; settings = {ATTRIBUTES = (Required, ); }; };
5BA899261CADB7F20012ED64 /* RealmLineRadarDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D87D1C634EBB00B54CBD /* RealmLineRadarDataSet.swift */; };
5BA899271CADB7F20012ED64 /* RealmPieDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8801C634EBB00B54CBD /* RealmPieDataSet.swift */; };
5BA899281CADB7F20012ED64 /* RealmLineDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D87C1C634EBB00B54CBD /* RealmLineDataSet.swift */; };
5BA899291CADB7F20012ED64 /* RealmChartUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B4AC1811C4C12B80028D1A6 /* RealmChartUtils.swift */; };
5BA8992A1CADB7F20012ED64 /* RealmScatterDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8841C634EBB00B54CBD /* RealmScatterDataSet.swift */; };
5BA8992B1CADB7F20012ED64 /* RealmBarData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8731C634EBB00B54CBD /* RealmBarData.swift */; };
5BA8992C1CADB7F20012ED64 /* RealmBarDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8741C634EBB00B54CBD /* RealmBarDataSet.swift */; };
5BA8992D1CADB7F20012ED64 /* RealmBaseDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8761C634EBB00B54CBD /* RealmBaseDataSet.swift */; };
5BA8992E1CADB7F20012ED64 /* RealmCandleDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D87A1C634EBB00B54CBD /* RealmCandleDataSet.swift */; };
5BA8992F1CADB7F20012ED64 /* RealmCandleData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8791C634EBB00B54CBD /* RealmCandleData.swift */; };
5BA899301CADB7F20012ED64 /* RealmBubbleData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8771C634EBB00B54CBD /* RealmBubbleData.swift */; };
5BA899311CADB7F20012ED64 /* RealmBarLineScatterCandleBubbleDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8751C634EBB00B54CBD /* RealmBarLineScatterCandleBubbleDataSet.swift */; };
5BA899321CADB7F20012ED64 /* RealmScatterData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8831C634EBB00B54CBD /* RealmScatterData.swift */; };
5BA899331CADB7F20012ED64 /* RealmBubbleDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8781C634EBB00B54CBD /* RealmBubbleDataSet.swift */; };
5BA899341CADB7F20012ED64 /* RealmLineScatterCandleRadarDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D87E1C634EBB00B54CBD /* RealmLineScatterCandleRadarDataSet.swift */; };
5BA899351CADB7F20012ED64 /* RealmRadarDataSet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8821C634EBB00B54CBD /* RealmRadarDataSet.swift */; };
5BA899361CADB7F20012ED64 /* RealmLineData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D87B1C634EBB00B54CBD /* RealmLineData.swift */; };
5BA899371CADB7F20012ED64 /* RealmPieData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D87F1C634EBB00B54CBD /* RealmPieData.swift */; };
5BA899381CADB7F20012ED64 /* RealmRadarData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B88D8811C634EBB00B54CBD /* RealmRadarData.swift */; };
5BA8993A1CADB7F20012ED64 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B88D8B01C63502500B54CBD /* Charts.framework */; settings = {ATTRIBUTES = (Required, ); }; };
5BA8993E1CADB7F20012ED64 /* ChartsRealm.h in Headers */ = {isa = PBXBuildFile; fileRef = 5B680D3C1A9D1AD90026A057 /* ChartsRealm.h */; settings = {ATTRIBUTES = (Public, ); }; };
5BA8994C1CADB8EC0012ED64 /* Realm.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BA8994A1CADB8EC0012ED64 /* Realm.framework */; };
5BA8994D1CADB8EC0012ED64 /* RealmSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5BA8994B1CADB8EC0012ED64 /* RealmSwift.framework */; };
5BF782821C840EE1003A9E91 /* Charts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5B88D8B21C63502500B54CBD /* Charts.framework */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -112,12 +135,25 @@
5B88D8831C634EBB00B54CBD /* RealmScatterData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmScatterData.swift; sourceTree = "<group>"; };
5B88D8841C634EBB00B54CBD /* RealmScatterDataSet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RealmScatterDataSet.swift; sourceTree = "<group>"; };
5B88D8A91C63502400B54CBD /* Charts.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Charts.xcodeproj; path = ../Charts/Charts.xcodeproj; sourceTree = "<group>"; };
5BA899431CADB7F20012ED64 /* ChartsRealm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ChartsRealm.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5BA8994A1CADB8EC0012ED64 /* Realm.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Realm.framework; sourceTree = "<group>"; };
5BA8994B1CADB8EC0012ED64 /* RealmSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RealmSwift.framework; sourceTree = "<group>"; };
5BA8EC401A9D14DC00CE82E1 /* ChartsRealm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ChartsRealm.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5BA8EC441A9D14DC00CE82E1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
A52C5C371BAC5CA400594CDD /* ChartsRealm.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ChartsRealm.framework; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
5BA899391CADB7F20012ED64 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
5BA8994C1CADB8EC0012ED64 /* Realm.framework in Frameworks */,
5BA8994D1CADB8EC0012ED64 /* RealmSwift.framework in Frameworks */,
5BA8993A1CADB7F20012ED64 /* Charts.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5BA8EC3C1A9D14DC00CE82E1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -153,6 +189,7 @@
isa = PBXGroup;
children = (
5B4AC12D1C44684E0028D1A6 /* ios */,
5BA899491CADB8EC0012ED64 /* osx */,
5B4AC1301C44684E0028D1A6 /* tvos */,
);
name = Realm;
Expand Down Expand Up @@ -188,6 +225,15 @@
name = Products;
sourceTree = "<group>";
};
5BA899491CADB8EC0012ED64 /* osx */ = {
isa = PBXGroup;
children = (
5BA8994A1CADB8EC0012ED64 /* Realm.framework */,
5BA8994B1CADB8EC0012ED64 /* RealmSwift.framework */,
);
path = osx;
sourceTree = "<group>";
};
5BA8EC361A9D14DC00CE82E1 = {
isa = PBXGroup;
children = (
Expand All @@ -204,6 +250,7 @@
children = (
5BA8EC401A9D14DC00CE82E1 /* ChartsRealm.framework */,
A52C5C371BAC5CA400594CDD /* ChartsRealm.framework */,
5BA899431CADB7F20012ED64 /* ChartsRealm.framework */,
);
name = Products;
sourceTree = "<group>";
Expand Down Expand Up @@ -262,6 +309,14 @@
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
5BA8993D1CADB7F20012ED64 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
5BA8993E1CADB7F20012ED64 /* ChartsRealm.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5BA8EC3D1A9D14DC00CE82E1 /* Headers */ = {
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -281,6 +336,24 @@
/* End PBXHeadersBuildPhase section */

/* Begin PBXNativeTarget section */
5BA899241CADB7F20012ED64 /* ChartsRealm-OSX */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5BA899401CADB7F20012ED64 /* Build configuration list for PBXNativeTarget "ChartsRealm-OSX" */;
buildPhases = (
5BA899251CADB7F20012ED64 /* Sources */,
5BA899391CADB7F20012ED64 /* Frameworks */,
5BA8993D1CADB7F20012ED64 /* Headers */,
5BA8993F1CADB7F20012ED64 /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = "ChartsRealm-OSX";
productName = Charts;
productReference = 5BA899431CADB7F20012ED64 /* ChartsRealm.framework */;
productType = "com.apple.product-type.framework";
};
5BA8EC3F1A9D14DC00CE82E1 /* ChartsRealm-iOS */ = {
isa = PBXNativeTarget;
buildConfigurationList = 5BA8EC561A9D14DC00CE82E1 /* Build configuration list for PBXNativeTarget "ChartsRealm-iOS" */;
Expand Down Expand Up @@ -358,6 +431,7 @@
targets = (
5BA8EC3F1A9D14DC00CE82E1 /* ChartsRealm-iOS */,
A52C5C361BAC5CA400594CDD /* ChartsRealm-TV */,
5BA899241CADB7F20012ED64 /* ChartsRealm-OSX */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -394,6 +468,13 @@
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
5BA8993F1CADB7F20012ED64 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
5BA8EC3E1A9D14DC00CE82E1 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
Expand All @@ -411,6 +492,32 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
5BA899251CADB7F20012ED64 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
5BA899261CADB7F20012ED64 /* RealmLineRadarDataSet.swift in Sources */,
5BA899271CADB7F20012ED64 /* RealmPieDataSet.swift in Sources */,
5BA899281CADB7F20012ED64 /* RealmLineDataSet.swift in Sources */,
5BA899291CADB7F20012ED64 /* RealmChartUtils.swift in Sources */,
5BA8992A1CADB7F20012ED64 /* RealmScatterDataSet.swift in Sources */,
5BA8992B1CADB7F20012ED64 /* RealmBarData.swift in Sources */,
5BA8992C1CADB7F20012ED64 /* RealmBarDataSet.swift in Sources */,
5BA8992D1CADB7F20012ED64 /* RealmBaseDataSet.swift in Sources */,
5BA8992E1CADB7F20012ED64 /* RealmCandleDataSet.swift in Sources */,
5BA8992F1CADB7F20012ED64 /* RealmCandleData.swift in Sources */,
5BA899301CADB7F20012ED64 /* RealmBubbleData.swift in Sources */,
5BA899311CADB7F20012ED64 /* RealmBarLineScatterCandleBubbleDataSet.swift in Sources */,
5BA899321CADB7F20012ED64 /* RealmScatterData.swift in Sources */,
5BA899331CADB7F20012ED64 /* RealmBubbleDataSet.swift in Sources */,
5BA899341CADB7F20012ED64 /* RealmLineScatterCandleRadarDataSet.swift in Sources */,
5BA899351CADB7F20012ED64 /* RealmRadarDataSet.swift in Sources */,
5BA899361CADB7F20012ED64 /* RealmLineData.swift in Sources */,
5BA899371CADB7F20012ED64 /* RealmPieData.swift in Sources */,
5BA899381CADB7F20012ED64 /* RealmRadarData.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
5BA8EC3B1A9D14DC00CE82E1 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -466,6 +573,59 @@
/* End PBXSourcesBuildPhase section */

/* Begin XCBuildConfiguration section */
5BA899411CADB7F20012ED64 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ThirdParty/Realm/osx",
);
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealmOSX;
PRODUCT_NAME = ChartsRealm;
PROVISIONING_PROFILE = "";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = macosx;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
name = Debug;
};
5BA899421CADB7F20012ED64 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
APPLICATION_EXTENSION_API_ONLY = YES;
CLANG_ENABLE_MODULES = YES;
DEFINES_MODULE = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ThirdParty/Realm/osx",
);
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.dcg.ChartsRealmOSX;
PRODUCT_NAME = ChartsRealm;
PROVISIONING_PROFILE = "";
SDKROOT = macosx;
SKIP_INSTALL = YES;
SUPPORTED_PLATFORMS = macosx;
};
name = Release;
};
5BA8EC541A9D14DC00CE82E1 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
Expand Down Expand Up @@ -614,7 +774,6 @@
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ThirdParty/Realm/tvos",
"$(PROJECT_DIR)/ThirdParty/Realm/ios",
);
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand Down Expand Up @@ -643,7 +802,6 @@
"$(inherited)",
"$(PROJECT_DIR)/ThirdParty",
"$(PROJECT_DIR)/ThirdParty/Realm/tvos",
"$(PROJECT_DIR)/ThirdParty/Realm/ios",
);
INFOPLIST_FILE = "Supporting Files/Info.plist";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
Expand All @@ -661,6 +819,15 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
5BA899401CADB7F20012ED64 /* Build configuration list for PBXNativeTarget "ChartsRealm-OSX" */ = {
isa = XCConfigurationList;
buildConfigurations = (
5BA899411CADB7F20012ED64 /* Debug */,
5BA899421CADB7F20012ED64 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
5BA8EC3A1A9D14DC00CE82E1 /* Build configuration list for PBXProject "ChartsRealm" */ = {
isa = XCConfigurationList;
buildConfigurations = (
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0730"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA899241CADB7F20012ED64"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm-OSX"
ReferencedContainer = "container:ChartsRealm.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA899241CADB7F20012ED64"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm-OSX"
ReferencedContainer = "container:ChartsRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA899241CADB7F20012ED64"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm-OSX"
ReferencedContainer = "container:ChartsRealm.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
4 changes: 2 additions & 2 deletions ChartsRealm/Classes/Data/RealmRadarDataSet.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ public class RealmRadarDataSet: RealmLineRadarDataSet, IRadarChartDataSet
/// - returns: true if highlight circle should be drawn, false if not
public var isDrawHighlightCircleEnabled: Bool { return drawHighlightCircleEnabled }

public var highlightCircleFillColor: UIColor? = UIColor.whiteColor()
public var highlightCircleFillColor: NSUIColor? = NSUIColor.whiteColor()

/// The stroke color for highlight circle.
/// If `nil`, the color of the dataset is taken.
public var highlightCircleStrokeColor: UIColor?
public var highlightCircleStrokeColor: NSUIColor?

public var highlightCircleStrokeAlpha: CGFloat = 0.3

Expand Down
2 changes: 1 addition & 1 deletion ChartsRealm/Supporting Files/ChartsRealm.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// https://github.com/danielgindi/ios-charts
//

#import <UIKit/UIKit.h>
#import <Foundation/Foundation.h>

//! Project version number for ChartsRealm.
FOUNDATION_EXPORT double ChartsRealmVersionNumber;
Expand Down
Loading

0 comments on commit 2da8db0

Please sign in to comment.