Swagger update, MHVTime isEqual fix (#145)

* Remove DynamicEnums

* Use Swagger generated enums, update & re-run codegen

* Updated pod version to 3.0-preview.4

* no message

* Update Podspec version

* Update Podfile
This commit is contained in:
Michael Burford 2017-09-25 10:28:29 -07:00 коммит произвёл GitHub
Родитель 9f448c7735
Коммит b6a9ae4301
8 изменённых файлов: 62 добавлений и 30 удалений

Просмотреть файл

@ -1,11 +1,11 @@
PODS:
- EncryptedCoreData (3.1):
- SQLCipher (~> 3.4.0)
- HealthVault (3.0-preview.4):
- HealthVault/CachingSupport (= 3.0-preview.4)
- HealthVault/CachingSupport (3.0-preview.4):
- HealthVault (3.0-preview.5):
- HealthVault/CachingSupport (= 3.0-preview.5)
- HealthVault/CachingSupport (3.0-preview.5):
- EncryptedCoreData (~> 3.1)
- HealthVault/Tests (3.0-preview.4):
- HealthVault/Tests (3.0-preview.5):
- EncryptedCoreData (~> 3.1)
- Kiwi (2.4.0)
- SQLCipher (3.4.1):
@ -27,7 +27,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
EncryptedCoreData: f6762fb05f88a52f36c5648659abc91b57f244b4
HealthVault: be22c598fda46b7009eaea76d3eee5cc84fe59b6
HealthVault: 7769453ba55849e8360625284fdc87764464841b
Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8
SQLCipher: 43d12c0eb9c57fb438749618fc3ce0065509a559

4
Example/Pods/Local Podspecs/HealthVault.podspec.json сгенерированный
Просмотреть файл

@ -1,6 +1,6 @@
{
"name": "HealthVault",
"version": "3.0-preview.4",
"version": "3.0-preview.5",
"summary": "An iOS framework you can use to build applications that leverage the Microsoft HealthVault platform",
"description": "The healthvault-ios-sdk framework simplifies developing apps that use the Microsoft HealthVault platform. It handles authenticating users, managing credentials, serializing data types and much more.",
"homepage": "https://github.com/Microsoft/healthvault-ios-sdk",
@ -13,7 +13,7 @@
},
"source": {
"git": "https://github.com/Microsoft/healthvault-ios-sdk.git",
"tag": "3.0-preview.4"
"tag": "3.0-preview.5"
},
"platforms": {
"ios": "8.0"

10
Example/Pods/Manifest.lock сгенерированный
Просмотреть файл

@ -1,11 +1,11 @@
PODS:
- EncryptedCoreData (3.1):
- SQLCipher (~> 3.4.0)
- HealthVault (3.0-preview.4):
- HealthVault/CachingSupport (= 3.0-preview.4)
- HealthVault/CachingSupport (3.0-preview.4):
- HealthVault (3.0-preview.5):
- HealthVault/CachingSupport (= 3.0-preview.5)
- HealthVault/CachingSupport (3.0-preview.5):
- EncryptedCoreData (~> 3.1)
- HealthVault/Tests (3.0-preview.4):
- HealthVault/Tests (3.0-preview.5):
- EncryptedCoreData (~> 3.1)
- Kiwi (2.4.0)
- SQLCipher (3.4.1):
@ -27,7 +27,7 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
EncryptedCoreData: f6762fb05f88a52f36c5648659abc91b57f244b4
HealthVault: be22c598fda46b7009eaea76d3eee5cc84fe59b6
HealthVault: 7769453ba55849e8360625284fdc87764464841b
Kiwi: f49c9d54b28917df5928fe44968a39ed198cb8a8
SQLCipher: 43d12c0eb9c57fb438749618fc3ce0065509a559

Просмотреть файл

@ -7,48 +7,61 @@
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForAnalyzing = "YES"
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES">
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = 'primary'
BlueprintIdentifier = '0A589C3613B722D501226B025FF00EA2'
BlueprintName = 'HealthVault-Tests'
ReferencedContainer = 'container:Pods.xcodeproj'
BuildableName = 'HealthVault-Tests.framework'>
BuildableIdentifier = "primary"
BlueprintIdentifier = "0A589C3613B722D501226B025FF00EA2"
BuildableName = "HealthVault.framework"
BlueprintName = "HealthVault-Tests"
ReferencedContainer = "container:Pods.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
buildConfiguration = "Debug">
language = ""
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
buildConfiguration = "Debug"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "0A589C3613B722D501226B025FF00EA2"
BuildableName = "HealthVault.framework"
BlueprintName = "HealthVault-Tests"
ReferencedContainer = "container:Pods.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES"
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES">
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">

Просмотреть файл

@ -4,7 +4,7 @@
Pod::Spec.new do |s|
s.name = 'HealthVault'
s.version = '3.0-preview.4'
s.version = '3.0-preview.5'
s.summary = 'An iOS framework you can use to build applications that leverage the Microsoft HealthVault platform'

Просмотреть файл

@ -78,9 +78,9 @@ NS_ASSUME_NONNULL_BEGIN
/* The text shown during task signup. [optional]
*/
@property(strong,nonatomic,nullable) NSString* signupName;
/* The ID of the associated plan. This is not needed when adding a task as part of a new plan
/* The ID of the associated plan. This is not needed when adding a task as part of a new plan [optional]
*/
@property(strong,nonatomic) NSString* associatedPlanId;
@property(strong,nonatomic,nullable) NSString* associatedPlanId;
/* The list of objective IDs the task is associated with
*/
@property(strong,nonatomic) NSArray<NSString*>* associatedObjectiveIds;

Просмотреть файл

@ -104,9 +104,9 @@ NS_ASSUME_NONNULL_BEGIN
/* The text shown during task signup. [optional]
*/
@property(strong,nonatomic,nullable) NSString* signupName;
/* The ID of the associated plan. This is not needed when adding a task as part of a new plan
/* The ID of the associated plan. This is not needed when adding a task as part of a new plan [optional]
*/
@property(strong,nonatomic) NSString* associatedPlanId;
@property(strong,nonatomic,nullable) NSString* associatedPlanId;
/* The list of objective IDs the task is associated with
*/
@property(strong,nonatomic) NSArray<NSString*>* associatedObjectiveIds;

Просмотреть файл

@ -373,5 +373,24 @@ static const xmlChar *x_element_millis = XMLSTRINGCONST("f");
return types;
}
- (BOOL)isEqual:(id)object
{
// Base class implements isEqual, but does not work correctly for MHVTime
if (![object isKindOfClass:[MHVTime class]])
{
return NO;
}
MHVTime *time = (MHVTime *)object;
return self.hour == time.hour && self.minute == time.minute && self.second == time.second;
}
- (NSUInteger)hash
{
//Convert to seconds for hash value
return self.hour * 3600 + self.minute * 60 + (self.hasSecond ? self.second : 0);
}
@end