From 6c9051ff1009ddc1b96c1ee979fce53a1b91c80a Mon Sep 17 00:00:00 2001 From: Dmitriy Kuragin Date: Wed, 18 Jan 2017 12:02:06 +0700 Subject: [PATCH 1/7] version 0.7.0 --- ApiAI.podspec.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ApiAI.podspec.json b/ApiAI.podspec.json index 185d4ea..7238e66 100644 --- a/ApiAI.podspec.json +++ b/ApiAI.podspec.json @@ -1,6 +1,6 @@ { "name": "ApiAI", - "version": "0.6.2", + "version": "0.7.0", "license": "Apache 2.0", "summary": "The API.AI iOS SDK makes it easy to integrate speech recognition with API.AI natural language processing API on iOS devices.", "homepage": "http://api.ai/", @@ -10,7 +10,7 @@ "source": { "git": "https://github.com/api-ai/api-ai-ios-sdk.git", - "tag": "v0.6.2" + "tag": "v0.7.0" }, "requires_arc": true, From ceab3ac15fa657dfa636786dc8073e0f396ea680 Mon Sep 17 00:00:00 2001 From: Dmitrii Kuragin Date: Mon, 24 Jul 2017 10:43:58 -0700 Subject: [PATCH 2/7] Added originalRequest support. --- ApiAI.xcodeproj/project.pbxproj | 12 ++++++-- ApiAI/Classes/AIOriginalRequest.h | 21 +++++++++++++ ApiAI/Classes/AIOriginalRequest.m | 33 +++++++++++++++++++++ ApiAI/Classes/AIQueryRequest.h | 5 ++++ ApiAI/Classes/AITextRequest.m | 4 ++- ApiAI/EventRequest/AIEventRequest.m | 3 ++ ApiAI/Private/AIOriginalRequest_Private.h | 15 ++++++++++ ApiAI/Private/AIQueryRequest+Private.m | 3 ++ ApiAI/VoiceRequest/Classes/AIVoiceRequest.m | 3 ++ ApiAITests/ApiAITests.m | 25 ++++++++++++++++ ApiAITests/UserEntitiesTests.m | 1 - 11 files changed, 121 insertions(+), 4 deletions(-) create mode 100644 ApiAI/Classes/AIOriginalRequest.h create mode 100644 ApiAI/Classes/AIOriginalRequest.m create mode 100644 ApiAI/Private/AIOriginalRequest_Private.h diff --git a/ApiAI.xcodeproj/project.pbxproj b/ApiAI.xcodeproj/project.pbxproj index 622e618..d7b54c6 100644 --- a/ApiAI.xcodeproj/project.pbxproj +++ b/ApiAI.xcodeproj/project.pbxproj @@ -232,6 +232,7 @@ 58F0605C1A8CB3E5002615DF /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 58F0605B1A8CB3E5002615DF /* SystemConfiguration.framework */; }; 58FF3A2C1C43BD240038BD9D /* AIUserEntitiesRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 58FF3A291C43BD240038BD9D /* AIUserEntitiesRequest.m */; }; 58FF3A2D1C43BD240038BD9D /* AIUserEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 58FF3A2B1C43BD240038BD9D /* AIUserEntity.m */; }; + FFC0CE201F22BB8B00E81778 /* AIOriginalRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = FFC0CE1F1F22BB8B00E81778 /* AIOriginalRequest.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -418,6 +419,9 @@ C6FA9A492FC4834AFAEB5D93 /* Pods-ApiAITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ApiAITests.release.xcconfig"; path = "Pods/Target Support Files/Pods-ApiAITests/Pods-ApiAITests.release.xcconfig"; sourceTree = ""; }; CA2094AC803A0620EF22CE82 /* Pods-ApiAITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ApiAITests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ApiAITests/Pods-ApiAITests.debug.xcconfig"; sourceTree = ""; }; DD80C016B73942D79FF2B0CD /* libPods-ApiAI.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ApiAI.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + FFC0CE1E1F22BB8B00E81778 /* AIOriginalRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIOriginalRequest.h; sourceTree = ""; }; + FFC0CE1F1F22BB8B00E81778 /* AIOriginalRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AIOriginalRequest.m; sourceTree = ""; }; + FFC0CE211F265D9000E81778 /* AIOriginalRequest_Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AIOriginalRequest_Private.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -692,6 +696,8 @@ 5862C2D51BAEABE1007C6C4F /* AIRequestContext.m */, 581409F31C86B8290014BBE8 /* AIQueryRequest.h */, 581409F41C86B8290014BBE8 /* AIQueryRequest.m */, + FFC0CE1E1F22BB8B00E81778 /* AIOriginalRequest.h */, + FFC0CE1F1F22BB8B00E81778 /* AIOriginalRequest.m */, ); path = Classes; sourceTree = ""; @@ -709,6 +715,7 @@ 581409F01C86B1500014BBE8 /* AISessionIdentifierStorage.h */, 581409F11C86B1500014BBE8 /* AISessionIdentifierStorage.m */, 581409F61C86B9AC0014BBE8 /* AIRequest_Private.h */, + FFC0CE211F265D9000E81778 /* AIOriginalRequest_Private.h */, ); path = Private; sourceTree = ""; @@ -1202,6 +1209,7 @@ 58D696FF1B679D0300693710 /* AIVoiceRequest.m in Sources */, 584509B019F4EB6B00A0AE9A /* AIStreamBuffer.m in Sources */, 588D23A11AFB3C95008289F1 /* AIDatePeriodFormatter.m in Sources */, + FFC0CE201F22BB8B00E81778 /* AIOriginalRequest.m in Sources */, 58C2A85C19BEE0E000632C2F /* AIRequest.m in Sources */, 58C2A86219BEE0E000632C2F /* AIDataService.m in Sources */, 58FF3A2D1C43BD240038BD9D /* AIUserEntity.m in Sources */, @@ -1498,7 +1506,7 @@ MTL_ENABLE_DEBUG_INFO = YES; PRODUCT_BUNDLE_IDENTIFIER = "com.sstepashka.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; + SDKROOT = iphoneos; }; name = Debug; }; @@ -1513,7 +1521,7 @@ MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_BUNDLE_IDENTIFIER = "com.sstepashka.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; + SDKROOT = iphoneos; }; name = Release; }; diff --git a/ApiAI/Classes/AIOriginalRequest.h b/ApiAI/Classes/AIOriginalRequest.h new file mode 100644 index 0000000..87e1f21 --- /dev/null +++ b/ApiAI/Classes/AIOriginalRequest.h @@ -0,0 +1,21 @@ +// +// AIOriginalRequest.h +// ApiAI +// +// Created by Dmitrii Kuragin on 7/21/17. +// Copyright © 2017 Kuragin Dmitriy. All rights reserved. +// + +#import + +#import "AINullabilityDefines.h" + +@interface AIOriginalRequest : NSObject + +- (AI_NONNULL instancetype)initWithSource:(NSString * __AI_NULLABLE)source + andData:(NSDictionary AI_GENERICS_2(NSString *, id) * __AI_NULLABLE)data; + +@property(nonatomic, copy, readonly, AI_NULLABLE) NSString *source; +@property(nonatomic, copy, readonly, AI_NULLABLE) NSDictionary AI_GENERICS_2(NSString *, id) *data; + +@end diff --git a/ApiAI/Classes/AIOriginalRequest.m b/ApiAI/Classes/AIOriginalRequest.m new file mode 100644 index 0000000..dab94c5 --- /dev/null +++ b/ApiAI/Classes/AIOriginalRequest.m @@ -0,0 +1,33 @@ +// +// AIOriginalRequest.m +// ApiAI +// +// Created by Dmitrii Kuragin on 7/21/17. +// Copyright © 2017 Kuragin Dmitriy. All rights reserved. +// + +#import "AIOriginalRequest.h" +#import "AIOriginalRequest_Private.h" + +@implementation AIOriginalRequest + +- (AI_NONNULL instancetype)initWithSource:(NSString * __AI_NULLABLE)source + andData:(NSDictionary AI_GENERICS_2(NSString *, id) * __AI_NULLABLE)data +{ + self = [super init]; + if (self) { + _source = [source copy]; + _data = [data copy]; + } + + return self; +} + +- (NSDictionary *)serialized { + return @{ + @"source": _source, + @"data": _data + }; +} + +@end diff --git a/ApiAI/Classes/AIQueryRequest.h b/ApiAI/Classes/AIQueryRequest.h index e215cee..95ff93d 100644 --- a/ApiAI/Classes/AIQueryRequest.h +++ b/ApiAI/Classes/AIQueryRequest.h @@ -9,6 +9,7 @@ #import #import "AIRequest.h" +#import "AIOriginalRequest.h" @interface AIQueryRequestLocation : NSObject @@ -107,4 +108,8 @@ */ @property(nonatomic, strong) AIQueryRequestLocation *location; +/*! + */ +@property(nonatomic, strong) AIOriginalRequest *originalRequest; + @end diff --git a/ApiAI/Classes/AITextRequest.m b/ApiAI/Classes/AITextRequest.m index 33f6fec..c1b0736 100644 --- a/ApiAI/Classes/AITextRequest.m +++ b/ApiAI/Classes/AITextRequest.m @@ -26,6 +26,7 @@ #import "AIRequestEntity_Private.h" #import "AIQueryRequest+Private.h" #import "AIRequest_Private.h" +#import "AiOriginalRequest_Private.h" #import "AIResponseConstants.h" @@ -52,6 +53,8 @@ - (void)configureHTTPRequest @"lang": self.lang } mutableCopy]; + parameters[@"originalRequest"] = [self.originalRequest serialized]; + if (self.resetContexts) { parameters[@"resetContexts"] = @(YES); } @@ -121,7 +124,6 @@ - (void)configureHTTPRequest } else { [self handleError:responseSerializeError]; } - } else { NSError *responseStatusCodeError = [NSError errorWithDomain:AIErrorDomain diff --git a/ApiAI/EventRequest/AIEventRequest.m b/ApiAI/EventRequest/AIEventRequest.m index c761b76..a1539bd 100644 --- a/ApiAI/EventRequest/AIEventRequest.m +++ b/ApiAI/EventRequest/AIEventRequest.m @@ -13,6 +13,7 @@ #import "AIRequestEntity_Private.h" #import "AIQueryRequest+Private.h" #import "AIRequest_Private.h" +#import "AiOriginalRequest_Private.h" #import "AIResponseConstants.h" @@ -43,6 +44,8 @@ - (void)configureHTTPRequest { @"lang": self.lang } mutableCopy]; + parameters[@"originalRequest"] = [self.originalRequest serialized]; + if (self.resetContexts) { parameters[@"resetContexts"] = @(YES); } diff --git a/ApiAI/Private/AIOriginalRequest_Private.h b/ApiAI/Private/AIOriginalRequest_Private.h new file mode 100644 index 0000000..177d290 --- /dev/null +++ b/ApiAI/Private/AIOriginalRequest_Private.h @@ -0,0 +1,15 @@ +// +// AIOriginalRequest_Private.h +// ApiAI +// +// Created by Dmitrii Kuragin on 7/24/17. +// Copyright © 2017 Kuragin Dmitriy. All rights reserved. +// + +#import "AIOriginalRequest.h" + +@interface AIOriginalRequest () + +- (NSDictionary *)serialized; + +@end diff --git a/ApiAI/Private/AIQueryRequest+Private.m b/ApiAI/Private/AIQueryRequest+Private.m index 6875739..ce2ac96 100644 --- a/ApiAI/Private/AIQueryRequest+Private.m +++ b/ApiAI/Private/AIQueryRequest+Private.m @@ -11,6 +11,7 @@ #import "AIDataService_Private.h" #import "AIRequestEntity_Private.h" #import "AINullabilityDefines.h" +#import "AIOriginalRequest_Private.h" static NSString *URLEncode(NSString *string) { return [string stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding]; @@ -37,6 +38,8 @@ - (NSDictionary *)requestBodyDictionary @"timezone": timeZoneString } mutableCopy]; + parameters[@"originalRequest"] = [self.originalRequest serialized]; + if (self.resetContexts) { parameters[@"resetContexts"] = @(self.resetContexts); } diff --git a/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m b/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m index 0c3f5db..8db7d27 100644 --- a/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m +++ b/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m @@ -28,6 +28,7 @@ #import "AIRequestEntity_Private.h" #import "AIQueryRequest+Private.h" #import "AIRequest_Private.h" +#import "AiOriginalRequest_Private.h" #import "AIResponseConstants.h" @@ -205,6 +206,8 @@ - (void)configureHTTPRequest @"timezone": timeZoneString } mutableCopy]; + parameters[@"originalRequest"] = [self.originalRequest serialized]; + if (self.resetContexts) { parameters[@"resetContexts"] = @(self.resetContexts); } diff --git a/ApiAITests/ApiAITests.m b/ApiAITests/ApiAITests.m index 89524b8..37af2a3 100644 --- a/ApiAITests/ApiAITests.m +++ b/ApiAITests/ApiAITests.m @@ -430,4 +430,29 @@ - (void)testMappingExtensionMethod }]; } +- (void)testOriginalRequest { + XCTestExpectation *expectation = [self expectationWithDescription:@"Handle response"]; + + AITextRequest *textRequest = [_apiai textRequest]; + + textRequest.originalRequest = [[AIOriginalRequest alloc] initWithSource:@"facebook" andData:@{@"param1": @"value1"}]; + + textRequest.resetContexts = NO; + + textRequest.query = @"Hello"; + + [textRequest setMappedCompletionBlockSuccess:^(AIRequest *request, AIResponse *response) { + [expectation fulfill]; + } failure:^(AIRequest *request, NSError *error) { + XCTAssert(NO, @"Can't response error"); + }]; + + [_apiai enqueue:textRequest]; + + [self waitForExpectationsWithTimeout:60 + handler:^(NSError *error) { + XCTAssertNil(error, @"Error"); + }]; +} + @end diff --git a/ApiAITests/UserEntitiesTests.m b/ApiAITests/UserEntitiesTests.m index b2032d3..8432ef4 100644 --- a/ApiAITests/UserEntitiesTests.m +++ b/ApiAITests/UserEntitiesTests.m @@ -19,7 +19,6 @@ * ***********************************************************************************************************************/ -#import #import #import "ApiAI.h" From 62a78f54ad801296c9279c198fdfd38237575e54 Mon Sep 17 00:00:00 2001 From: Dmitrii Kuragin Date: Mon, 24 Jul 2017 11:23:48 -0700 Subject: [PATCH 3/7] version v0.7.1 --- ApiAI.podspec.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ApiAI.podspec.json b/ApiAI.podspec.json index 7238e66..5e4fde4 100644 --- a/ApiAI.podspec.json +++ b/ApiAI.podspec.json @@ -1,6 +1,6 @@ { "name": "ApiAI", - "version": "0.7.0", + "version": "0.7.1", "license": "Apache 2.0", "summary": "The API.AI iOS SDK makes it easy to integrate speech recognition with API.AI natural language processing API on iOS devices.", "homepage": "http://api.ai/", @@ -10,7 +10,7 @@ "source": { "git": "https://github.com/api-ai/api-ai-ios-sdk.git", - "tag": "v0.7.0" + "tag": "v0.7.1" }, "requires_arc": true, From 94a1d05f7055bfff1b3723c2fbd37d32990a66e6 Mon Sep 17 00:00:00 2001 From: Dmitrii Kuragin Date: Mon, 24 Jul 2017 11:42:01 -0700 Subject: [PATCH 4/7] added swift-version file. --- .swift-version | 1 + 1 file changed, 1 insertion(+) create mode 100644 .swift-version diff --git a/.swift-version b/.swift-version new file mode 100644 index 0000000..9f55b2c --- /dev/null +++ b/.swift-version @@ -0,0 +1 @@ +3.0 From 0f002c49588799cdacb116589e5e4b713fef5e85 Mon Sep 17 00:00:00 2001 From: Dmitrii Kuragin Date: Mon, 24 Jul 2017 11:42:24 -0700 Subject: [PATCH 5/7] added swift-version file. --- ApiAI.podspec.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ApiAI.podspec.json b/ApiAI.podspec.json index 5e4fde4..a3c1735 100644 --- a/ApiAI.podspec.json +++ b/ApiAI.podspec.json @@ -1,6 +1,6 @@ { "name": "ApiAI", - "version": "0.7.1", + "version": "0.7.2", "license": "Apache 2.0", "summary": "The API.AI iOS SDK makes it easy to integrate speech recognition with API.AI natural language processing API on iOS devices.", "homepage": "http://api.ai/", @@ -10,7 +10,7 @@ "source": { "git": "https://github.com/api-ai/api-ai-ios-sdk.git", - "tag": "v0.7.1" + "tag": "v0.7.2" }, "requires_arc": true, From b4959a548c24094b0742dc77eda4381d32f35ec4 Mon Sep 17 00:00:00 2001 From: Matt Carroll Date: Thu, 17 Aug 2017 13:11:04 -0700 Subject: [PATCH 6/7] Add contributing file and update license Change-Id: I33c9aa54fc208b3bc5097d16cf7ba141a29b4e84 --- ApiAI/ApiAI-Prefix.pch | 31 ++- .../Classes/AIAudioFileConvertOperation.h | 29 ++- .../Classes/AIAudioFileConvertOperation.mm | 29 ++- .../AIAudioFileConvertOperationTypes.h | 31 ++- .../AIAudioFileConvertOperationTypes.mm | 31 ++- .../Private/AIDataProcessInfo.cpp | 31 ++- .../Private/AIDataProcessInfo.hpp | 31 ++- ApiAI/Classes/AIConfiguration.h | 31 ++- ApiAI/Classes/AIDefaultConfiguration.h | 23 +- ApiAI/Classes/AIDefaultConfiguration.m | 23 +- ApiAI/Classes/AINullabilityDefines.h | 23 +- ApiAI/Classes/AIOriginalRequest.h | 24 ++- ApiAI/Classes/AIOriginalRequest.m | 24 ++- ApiAI/Classes/AIQueryRequest.h | 23 +- ApiAI/Classes/AIQueryRequest.m | 24 ++- ApiAI/Classes/AIRequest.h | 31 ++- ApiAI/Classes/AIRequest.m | 31 ++- ApiAI/Classes/AIRequestContext.h | 24 ++- ApiAI/Classes/AIRequestContext.m | 24 ++- ApiAI/Classes/AIRequestEntity.h | 24 ++- ApiAI/Classes/AIRequestEntity.m | 23 +- ApiAI/Classes/AIRequestEntry.h | 24 ++- ApiAI/Classes/AIRequestEntry.m | 22 +- ApiAI/Classes/AIResponseConstants.h | 31 ++- ApiAI/Classes/AIResponseConstants.m | 31 ++- ApiAI/Classes/AITextRequest.h | 33 ++- ApiAI/Classes/AITextRequest.m | 31 ++- ApiAI/Classes/ApiAI.h | 31 ++- ApiAI/Classes/ApiAI.m | 31 ++- ApiAI/EventRequest/AIEvent.h | 24 ++- ApiAI/EventRequest/AIEvent.m | 23 +- ApiAI/EventRequest/AIEventRequest.h | 23 +- ApiAI/EventRequest/AIEventRequest.m | 22 +- ApiAI/Private/AIDataService_Private.h | 31 ++- ApiAI/Private/AIOriginalRequest_Private.h | 23 +- ApiAI/Private/AIQueryRequest+Private.h | 23 +- ApiAI/Private/AIQueryRequest+Private.m | 22 +- ApiAI/Private/AIRequestEntity_Private.h | 23 +- ApiAI/Private/AIRequest_Private.h | 23 +- ApiAI/Private/AISessionIdentifierStorage.h | 22 +- ApiAI/Private/AISessionIdentifierStorage.m | 22 +- ApiAI/Private/ApiAI_ApiAI_Private.h | 31 ++- ApiAI/Private/Network/AIDataService.h | 31 ++- ApiAI/Private/Network/AIDataService.m | 31 ++- ApiAI/Private/Streamer/AIStreamBuffer.h | 31 ++- ApiAI/Private/Streamer/AIStreamBuffer.m | 31 ++- .../Private/Streamer/AIStreamBufferDelegate.h | 31 ++- .../Classes/AIRequest+AIMappedResponse.h | 31 ++- .../Classes/AIRequest+AIMappedResponse.m | 31 ++- ApiAI/Response/Classes/AIResponse.h | 31 ++- ApiAI/Response/Classes/AIResponse.m | 31 ++- ApiAI/Response/Classes/AIResponseContext.h | 31 ++- ApiAI/Response/Classes/AIResponseContext.m | 31 ++- .../Response/Classes/AIResponseFulfillment.h | 31 ++- .../Response/Classes/AIResponseFulfillment.m | 31 ++- ApiAI/Response/Classes/AIResponseMetadata.h | 31 ++- ApiAI/Response/Classes/AIResponseMetadata.m | 31 ++- ApiAI/Response/Classes/AIResponseParameter.h | 31 ++- ApiAI/Response/Classes/AIResponseParameter.m | 31 ++- ApiAI/Response/Classes/AIResponseResult.h | 31 ++- ApiAI/Response/Classes/AIResponseResult.m | 31 ++- ApiAI/Response/Classes/AIResponseStatus.h | 31 ++- ApiAI/Response/Classes/AIResponseStatus.m | 31 ++- .../Private/AIResponseContext_Private.h | 31 ++- .../Private/AIResponseFulfillment_Private.h | 31 ++- .../Private/AIResponseMetadata_Private.h | 31 ++- .../Private/AIResponseParameterConstants.h | 24 ++- .../Private/AIResponseParameterConstants.m | 24 ++- .../Private/AIResponseParameter_Private.h | 31 ++- .../Private/AIResponseResult_Private.h | 31 ++- .../Private/AIResponseStatus_Private.h | 31 ++- .../Formatters/AIDatePeriodFormatter.h | 31 ++- .../Formatters/AIDatePeriodFormatter.m | 24 ++- ApiAI/UIKit/Classes/AIVoiceRequestButton.h | 31 ++- ApiAI/UIKit/Classes/AIVoiceRequestButton.m | 31 ++- ApiAI/UIKit/Private/AIEllipseView.h | 31 ++- ApiAI/UIKit/Private/AIEllipseView.m | 31 ++- ApiAI/UIKit/Private/AIProgressView.h | 31 ++- ApiAI/UIKit/Private/AIProgressView.m | 31 ++- ApiAI/UIKit/Private/AIVoiceContainerView.h | 31 ++- ApiAI/UIKit/Private/AIVoiceContainerView.m | 31 ++- ApiAI/UIKit/Private/AIVoiceLevelView.h | 31 ++- ApiAI/UIKit/Private/AIVoiceLevelView.m | 31 ++- .../Classes/AIUserEntitiesRequest.h | 23 +- .../Classes/AIUserEntitiesRequest.m | 23 +- ApiAI/UserEntities/Classes/AIUserEntity.h | 23 +- ApiAI/UserEntities/Classes/AIUserEntity.m | 23 +- .../Private/AIUserEntity_Private.h | 23 +- .../Classes/AIVoiceFileRequest.h | 24 ++- .../Classes/AIVoiceFileRequest.m | 23 +- .../Private/AIVoiceFileRequest_Private.h | 23 +- ApiAI/VoiceRequest/Classes/AIVoiceRequest.h | 32 ++- ApiAI/VoiceRequest/Classes/AIVoiceRequest.m | 31 ++- .../AlgorithmDetector/AIAlgorithmDetector.h | 31 ++- .../AlgorithmDetector/AIAlgorithmDetector.m | 31 ++- .../AIAlgorithmDetectorDelegate.h | 31 ++- .../AIAlgorithmDetectorTypes.h | 31 ++- .../AdaptiveThresold/AdaptiveThresold.h | 31 ++- .../AdaptiveThresold/AdaptiveThresold.m | 31 ++- .../EnergyAndZeroCross/EnergyAndZeroCross.h | 31 ++- .../EnergyAndZeroCross/EnergyAndZeroCross.m | 31 ++- .../Private/RecordDetector/AIRecordDetector.h | 31 ++- .../Private/RecordDetector/AIRecordDetector.m | 31 ++- .../RecordDetector/AIRecordDetectorDelegate.h | 31 ++- .../Private/SoundRecorder/AIAudioUtils.c | 31 ++- .../Private/SoundRecorder/AIAudioUtils.h | 31 ++- .../Private/SoundRecorder/AIMeterTable.h | 29 ++- .../Private/SoundRecorder/AIMeterTable.m | 31 ++- .../Private/SoundRecorder/AISoundRecorder.h | 31 ++- .../Private/SoundRecorder/AISoundRecorder.m | 31 ++- .../SoundRecorder/AISoundRecorderConstants.h | 31 ++- .../SoundRecorder/AISoundRecorderConstants.m | 31 ++- .../SoundRecorder/AISoundRecorderDelegate.h | 31 ++- ApiAIDemo/ApiAI/ApiAIDemo-Prefix.pch | 31 ++- ApiAIDemo/ApiAI/AppDelegate.h | 31 ++- ApiAIDemo/ApiAI/AppDelegate.m | 31 ++- .../MappedResponseViewController.h | 31 ++- .../MappedResponseViewController.m | 31 ++- .../ResultNavigarionController.h | 31 ++- .../ResultNavigarionController.m | 31 ++- .../ResultViewController.h | 29 ++- .../ResultViewController.m | 31 ++- .../TextRequestViewController.h | 31 ++- .../TextRequestViewController.m | 31 ++- ApiAIDemo/ApiAI/main.m | 23 +- .../ApiAIDemoSwift-Bridging-Header.h | 20 +- .../ApiAIDemoSwift/AppDelegate.swift | 24 ++- .../ResultNavigationController.swift | 24 ++- .../ResultViewController.swift | 23 +- .../TextRequestViewController.swift | 24 ++- .../ApiAIDemoSwiftTests.swift | 23 +- .../ExtensionDelegate.h | 32 ++- .../ExtensionDelegate.m | 31 ++- .../InterfaceController.h | 31 ++- .../InterfaceController.m | 31 ++- .../ApiAIDemoWatchOS/AppDelegate.h | 31 ++- .../ApiAIDemoWatchOS/AppDelegate.m | 31 ++- .../ApiAIDemoWatchOS/ViewController.h | 31 ++- .../ApiAIDemoWatchOS/ViewController.m | 31 ++- ApiAIDemoWatchOS/ApiAIDemoWatchOS/main.m | 23 +- .../ExtensionDelegate.swift | 23 +- .../InterfaceController.swift | 23 +- .../ApiAIDemoWatchOSSwift/AppDelegate.swift | 23 +- .../ViewController.swift | 23 +- ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.h | 24 ++- ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.m | 23 +- .../ApiAIMacOSDemo/ViewController.h | 22 +- .../ApiAIMacOSDemo/ViewController.m | 24 ++- ApiAIMacOSDemo/ApiAIMacOSDemo/main.m | 22 +- ApiAITests/AIVADTest.m | 23 +- ApiAITests/ApiAITests.m | 31 ++- ApiAITests/AudioFileReader.h | 24 ++- ApiAITests/AudioFileReader.m | 24 ++- ApiAITests/EventsTests.m | 24 ++- ApiAITests/SerializationTests.m | 24 ++- ApiAITests/UserEntitiesTests.m | 31 ++- CONTRIBUTING.md | 32 +++ LICENSE | 198 +++++++++++++++++- README.md | 10 + 159 files changed, 2421 insertions(+), 2206 deletions(-) create mode 100644 CONTRIBUTING.md diff --git a/ApiAI/ApiAI-Prefix.pch b/ApiAI/ApiAI-Prefix.pch index 668e1dd..aa09bb9 100644 --- a/ApiAI/ApiAI-Prefix.pch +++ b/ApiAI/ApiAI-Prefix.pch @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #ifdef __OBJC__ #import #endif diff --git a/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.h b/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.h index b188af6..308c491 100644 --- a/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.h +++ b/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.h @@ -1,23 +1,18 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import diff --git a/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.mm b/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.mm index 3af1786..41ebd59 100644 --- a/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.mm +++ b/ApiAI/AudioFileConverter/Classes/AIAudioFileConvertOperation.mm @@ -1,23 +1,18 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import "AIAudioFileConvertOperation.h" #import "AIAudioFileConvertOperationTypes.h" diff --git a/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.h b/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.h index 9120755..7120591 100644 --- a/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.h +++ b/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import diff --git a/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.mm b/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.mm index 8ed9f29..398cb4a 100644 --- a/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.mm +++ b/ApiAI/AudioFileConverter/Private/AIAudioFileConvertOperationTypes.mm @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIAudioFileConvertOperationTypes.h" OSStatus AIEncoderDataProc(AudioConverterRef inAudioConverter, UInt32 *ioNumberDataPackets, AudioBufferList *ioData, AudioStreamPacketDescription **outDataPacketDescription, void *inUserData) diff --git a/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.cpp b/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.cpp index d18b53e..80b04d1 100644 --- a/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.cpp +++ b/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.cpp @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "AIDataProcessInfo.hpp" AIDataProcessInfo::AIDataProcessInfo(UInt32 sizePerPacket, AudioFileID sourceFileID) : sizePerPacket(sizePerPacket), sourceFileID(sourceFileID) diff --git a/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.hpp b/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.hpp index 06f2546..d1382d2 100644 --- a/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.hpp +++ b/ApiAI/AudioFileConverter/Private/AIDataProcessInfo.hpp @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #ifndef DataProcessInfo_hpp #define DataProcessInfo_hpp diff --git a/ApiAI/Classes/AIConfiguration.h b/ApiAI/Classes/AIConfiguration.h index a711ee0..93fcd38 100644 --- a/ApiAI/Classes/AIConfiguration.h +++ b/ApiAI/Classes/AIConfiguration.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import /*! diff --git a/ApiAI/Classes/AIDefaultConfiguration.h b/ApiAI/Classes/AIDefaultConfiguration.h index f9b9ae4..37180ea 100644 --- a/ApiAI/Classes/AIDefaultConfiguration.h +++ b/ApiAI/Classes/AIDefaultConfiguration.h @@ -1,10 +1,19 @@ -// -// AIDefaultConfiguration.h -// ApiAI -// -// Created by Kuragin Dmitriy on 14/11/14. -// Copyright (c) 2014 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import diff --git a/ApiAI/Classes/AIDefaultConfiguration.m b/ApiAI/Classes/AIDefaultConfiguration.m index c63f515..1874c50 100644 --- a/ApiAI/Classes/AIDefaultConfiguration.m +++ b/ApiAI/Classes/AIDefaultConfiguration.m @@ -1,10 +1,19 @@ -// -// AIDefaultConfiguration.m -// ApiAI -// -// Created by Kuragin Dmitriy on 14/11/14. -// Copyright (c) 2014 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIDefaultConfiguration.h" diff --git a/ApiAI/Classes/AINullabilityDefines.h b/ApiAI/Classes/AINullabilityDefines.h index bfdff81..347aa4e 100644 --- a/ApiAI/Classes/AINullabilityDefines.h +++ b/ApiAI/Classes/AINullabilityDefines.h @@ -1,10 +1,19 @@ -// -// NullabilityDefines.h -// ApiAI -// -// Created by Kuragin Dmitriy on 22/06/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #ifndef ApiAI_NullabilityDefines_h #define ApiAI_NullabilityDefines_h diff --git a/ApiAI/Classes/AIOriginalRequest.h b/ApiAI/Classes/AIOriginalRequest.h index 87e1f21..a10001d 100644 --- a/ApiAI/Classes/AIOriginalRequest.h +++ b/ApiAI/Classes/AIOriginalRequest.h @@ -1,11 +1,19 @@ -// -// AIOriginalRequest.h -// ApiAI -// -// Created by Dmitrii Kuragin on 7/21/17. -// Copyright © 2017 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/Classes/AIOriginalRequest.m b/ApiAI/Classes/AIOriginalRequest.m index dab94c5..d5f87e8 100644 --- a/ApiAI/Classes/AIOriginalRequest.m +++ b/ApiAI/Classes/AIOriginalRequest.m @@ -1,11 +1,19 @@ -// -// AIOriginalRequest.m -// ApiAI -// -// Created by Dmitrii Kuragin on 7/21/17. -// Copyright © 2017 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIOriginalRequest.h" #import "AIOriginalRequest_Private.h" diff --git a/ApiAI/Classes/AIQueryRequest.h b/ApiAI/Classes/AIQueryRequest.h index 95ff93d..f2cd5ac 100644 --- a/ApiAI/Classes/AIQueryRequest.h +++ b/ApiAI/Classes/AIQueryRequest.h @@ -1,10 +1,19 @@ -// -// AIQueryRequest.h -// ApiAI -// -// Created by Kuragin Dmitriy on 02/03/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import diff --git a/ApiAI/Classes/AIQueryRequest.m b/ApiAI/Classes/AIQueryRequest.m index 11a1c39..ccbc297 100644 --- a/ApiAI/Classes/AIQueryRequest.m +++ b/ApiAI/Classes/AIQueryRequest.m @@ -1,11 +1,19 @@ -// -// AIQueryRequest.m -// ApiAI -// -// Created by Kuragin Dmitriy on 02/03/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIQueryRequest.h" #import "AISessionIdentifierStorage.h" diff --git a/ApiAI/Classes/AIRequest.h b/ApiAI/Classes/AIRequest.h index e287eb3..a97648d 100644 --- a/ApiAI/Classes/AIRequest.h +++ b/ApiAI/Classes/AIRequest.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AIRequestEntity.h" diff --git a/ApiAI/Classes/AIRequest.m b/ApiAI/Classes/AIRequest.m index 455d1be..57b6d28 100644 --- a/ApiAI/Classes/AIRequest.m +++ b/ApiAI/Classes/AIRequest.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequest.h" #import "AIDataService.h" #import "AISessionIdentifierStorage.h" diff --git a/ApiAI/Classes/AIRequestContext.h b/ApiAI/Classes/AIRequestContext.h index 24f6d0d..ebe22ac 100644 --- a/ApiAI/Classes/AIRequestContext.h +++ b/ApiAI/Classes/AIRequestContext.h @@ -1,11 +1,19 @@ -// -// AIRequestContext.h -// ApiAI -// -// Created by Kuragin Dmitriy on 20/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/Classes/AIRequestContext.m b/ApiAI/Classes/AIRequestContext.m index eeb0536..ab26cb3 100644 --- a/ApiAI/Classes/AIRequestContext.m +++ b/ApiAI/Classes/AIRequestContext.m @@ -1,11 +1,19 @@ -// -// AIRequestContext.m -// ApiAI -// -// Created by Kuragin Dmitriy on 20/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequestContext.h" @implementation AIRequestContext diff --git a/ApiAI/Classes/AIRequestEntity.h b/ApiAI/Classes/AIRequestEntity.h index f5aa84f..bf60972 100644 --- a/ApiAI/Classes/AIRequestEntity.h +++ b/ApiAI/Classes/AIRequestEntity.h @@ -1,11 +1,19 @@ -// -// AIRequestEntity.h -// ApiAI -// -// Created by Kuragin Dmitriy on 22/05/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AIRequestEntry.h" diff --git a/ApiAI/Classes/AIRequestEntity.m b/ApiAI/Classes/AIRequestEntity.m index 3ad5b91..e04899d 100644 --- a/ApiAI/Classes/AIRequestEntity.m +++ b/ApiAI/Classes/AIRequestEntity.m @@ -1,10 +1,19 @@ -// -// AIRequestEntity.m -// ApiAI -// -// Created by Kuragin Dmitriy on 22/05/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequestEntity.h" #import "AIRequestEntity_Private.h" diff --git a/ApiAI/Classes/AIRequestEntry.h b/ApiAI/Classes/AIRequestEntry.h index 486d8c3..1932bba 100644 --- a/ApiAI/Classes/AIRequestEntry.h +++ b/ApiAI/Classes/AIRequestEntry.h @@ -1,11 +1,19 @@ -// -// AIRequestContext.h -// ApiAI -// -// Created by Kuragin Dmitriy on 22/05/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/Classes/AIRequestEntry.m b/ApiAI/Classes/AIRequestEntry.m index b96c667..1ae8598 100644 --- a/ApiAI/Classes/AIRequestEntry.m +++ b/ApiAI/Classes/AIRequestEntry.m @@ -1,10 +1,18 @@ -// -// AIRequestContext.m -// ApiAI -// -// Created by Kuragin Dmitriy on 22/05/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import "AIRequestEntry.h" diff --git a/ApiAI/Classes/AIResponseConstants.h b/ApiAI/Classes/AIResponseConstants.h index d6ac49b..67e45d3 100644 --- a/ApiAI/Classes/AIResponseConstants.h +++ b/ApiAI/Classes/AIResponseConstants.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import /** diff --git a/ApiAI/Classes/AIResponseConstants.m b/ApiAI/Classes/AIResponseConstants.m index 76305ef..358fc20 100644 --- a/ApiAI/Classes/AIResponseConstants.m +++ b/ApiAI/Classes/AIResponseConstants.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseConstants.h" NSString *const AIErrorDomain = @"AIErrorDomain"; diff --git a/ApiAI/Classes/AITextRequest.h b/ApiAI/Classes/AITextRequest.h index d02be34..fa1faeb 100644 --- a/ApiAI/Classes/AITextRequest.h +++ b/ApiAI/Classes/AITextRequest.h @@ -1,25 +1,20 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - -#import "AIQueryRequest.h" + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #import "AIQueryRequest.h" @interface AITextRequest : AIQueryRequest diff --git a/ApiAI/Classes/AITextRequest.m b/ApiAI/Classes/AITextRequest.m index c1b0736..4927da2 100644 --- a/ApiAI/Classes/AITextRequest.m +++ b/ApiAI/Classes/AITextRequest.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AITextRequest.h" #import "AIDataService.h" #import "AIDataService_Private.h" diff --git a/ApiAI/Classes/ApiAI.h b/ApiAI/Classes/ApiAI.h index cd7be5a..d225733 100644 --- a/ApiAI/Classes/ApiAI.h +++ b/ApiAI/Classes/ApiAI.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AIConfiguration.h" diff --git a/ApiAI/Classes/ApiAI.m b/ApiAI/Classes/ApiAI.m index b9e12cf..4d74780 100644 --- a/ApiAI/Classes/ApiAI.m +++ b/ApiAI/Classes/ApiAI.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ApiAI.h" #import "AIDataService.h" #import "AITextRequest.h" diff --git a/ApiAI/EventRequest/AIEvent.h b/ApiAI/EventRequest/AIEvent.h index f078ef7..65a509d 100644 --- a/ApiAI/EventRequest/AIEvent.h +++ b/ApiAI/EventRequest/AIEvent.h @@ -1,11 +1,19 @@ -// -// AIEvent.h -// ApiAI -// -// Created by Kuragin Dmitriy on 09/12/2016. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AIEvent : NSObject diff --git a/ApiAI/EventRequest/AIEvent.m b/ApiAI/EventRequest/AIEvent.m index 3a0ac89..779ff57 100644 --- a/ApiAI/EventRequest/AIEvent.m +++ b/ApiAI/EventRequest/AIEvent.m @@ -1,10 +1,19 @@ -// -// AIEvent.m -// ApiAI -// -// Created by Kuragin Dmitriy on 09/12/2016. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIEvent.h" diff --git a/ApiAI/EventRequest/AIEventRequest.h b/ApiAI/EventRequest/AIEventRequest.h index 6811c2a..27452f5 100644 --- a/ApiAI/EventRequest/AIEventRequest.h +++ b/ApiAI/EventRequest/AIEventRequest.h @@ -1,10 +1,19 @@ -// -// AIEventRequest.h -// ApiAI -// -// Created by Kuragin Dmitriy on 09/12/2016. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIQueryRequest.h" #import "AIEvent.h" diff --git a/ApiAI/EventRequest/AIEventRequest.m b/ApiAI/EventRequest/AIEventRequest.m index a1539bd..6506135 100644 --- a/ApiAI/EventRequest/AIEventRequest.m +++ b/ApiAI/EventRequest/AIEventRequest.m @@ -1,10 +1,18 @@ -// -// AIEventRequest.m -// ApiAI -// -// Created by Kuragin Dmitriy on 09/12/2016. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import "AIEventRequest.h" #import "AIDataService.h" diff --git a/ApiAI/Private/AIDataService_Private.h b/ApiAI/Private/AIDataService_Private.h index 04f7023..fb8c016 100644 --- a/ApiAI/Private/AIDataService_Private.h +++ b/ApiAI/Private/AIDataService_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIDataService.h" @protocol AIConfiguration; diff --git a/ApiAI/Private/AIOriginalRequest_Private.h b/ApiAI/Private/AIOriginalRequest_Private.h index 177d290..118e30b 100644 --- a/ApiAI/Private/AIOriginalRequest_Private.h +++ b/ApiAI/Private/AIOriginalRequest_Private.h @@ -1,10 +1,19 @@ -// -// AIOriginalRequest_Private.h -// ApiAI -// -// Created by Dmitrii Kuragin on 7/24/17. -// Copyright © 2017 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIOriginalRequest.h" diff --git a/ApiAI/Private/AIQueryRequest+Private.h b/ApiAI/Private/AIQueryRequest+Private.h index 1195b42..3eb76e0 100644 --- a/ApiAI/Private/AIQueryRequest+Private.h +++ b/ApiAI/Private/AIQueryRequest+Private.h @@ -1,10 +1,19 @@ -// -// AIRequest+Private.h -// ApiAI -// -// Created by Kuragin Dmitriy on 28/07/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIQueryRequest.h" diff --git a/ApiAI/Private/AIQueryRequest+Private.m b/ApiAI/Private/AIQueryRequest+Private.m index ce2ac96..f05b85e 100644 --- a/ApiAI/Private/AIQueryRequest+Private.m +++ b/ApiAI/Private/AIQueryRequest+Private.m @@ -1,10 +1,18 @@ -// -// AIRequest+Private.m -// ApiAI -// -// Created by Kuragin Dmitriy on 28/07/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import "AIQueryRequest+Private.h" #import "AIConfiguration.h" diff --git a/ApiAI/Private/AIRequestEntity_Private.h b/ApiAI/Private/AIRequestEntity_Private.h index 8770db4..eb8d3ca 100644 --- a/ApiAI/Private/AIRequestEntity_Private.h +++ b/ApiAI/Private/AIRequestEntity_Private.h @@ -1,10 +1,19 @@ -// -// AIRequestEntity_Representation.h -// Pods -// -// Created by Kuragin Dmitriy on 22/05/15. -// -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequestEntity.h" diff --git a/ApiAI/Private/AIRequest_Private.h b/ApiAI/Private/AIRequest_Private.h index 79f0c54..2fd778a 100644 --- a/ApiAI/Private/AIRequest_Private.h +++ b/ApiAI/Private/AIRequest_Private.h @@ -1,10 +1,19 @@ -// -// AIRequest_Private.h -// ApiAI -// -// Created by Kuragin Dmitriy on 02/03/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequest.h" diff --git a/ApiAI/Private/AISessionIdentifierStorage.h b/ApiAI/Private/AISessionIdentifierStorage.h index 87c2462..ea430d8 100644 --- a/ApiAI/Private/AISessionIdentifierStorage.h +++ b/ApiAI/Private/AISessionIdentifierStorage.h @@ -1,10 +1,18 @@ -// -// AISessionIdentifierStorage.h -// ApiAI -// -// Created by Kuragin Dmitriy on 02/03/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import diff --git a/ApiAI/Private/AISessionIdentifierStorage.m b/ApiAI/Private/AISessionIdentifierStorage.m index 84f5805..7fd4d32 100644 --- a/ApiAI/Private/AISessionIdentifierStorage.m +++ b/ApiAI/Private/AISessionIdentifierStorage.m @@ -1,10 +1,18 @@ -// -// AISessionIdentifierStorage.m -// ApiAI -// -// Created by Kuragin Dmitriy on 02/03/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import "AISessionIdentifierStorage.h" #import diff --git a/ApiAI/Private/ApiAI_ApiAI_Private.h b/ApiAI/Private/ApiAI_ApiAI_Private.h index 3283166..b62a469 100644 --- a/ApiAI/Private/ApiAI_ApiAI_Private.h +++ b/ApiAI/Private/ApiAI_ApiAI_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ApiAI.h" @class AIDataService; diff --git a/ApiAI/Private/Network/AIDataService.h b/ApiAI/Private/Network/AIDataService.h index 4e93b9d..5dbcba9 100644 --- a/ApiAI/Private/Network/AIDataService.h +++ b/ApiAI/Private/Network/AIDataService.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequest.h" @protocol AIConfiguration; diff --git a/ApiAI/Private/Network/AIDataService.m b/ApiAI/Private/Network/AIDataService.m index d69a6d6..f379581 100644 --- a/ApiAI/Private/Network/AIDataService.m +++ b/ApiAI/Private/Network/AIDataService.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIDataService.h" #import "AIConfiguration.h" #import "AIDataService_Private.h" diff --git a/ApiAI/Private/Streamer/AIStreamBuffer.h b/ApiAI/Private/Streamer/AIStreamBuffer.h index 662b622..f87ac46 100644 --- a/ApiAI/Private/Streamer/AIStreamBuffer.h +++ b/ApiAI/Private/Streamer/AIStreamBuffer.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AIStreamBufferDelegate.h" diff --git a/ApiAI/Private/Streamer/AIStreamBuffer.m b/ApiAI/Private/Streamer/AIStreamBuffer.m index 1bc1336..7bc3472 100644 --- a/ApiAI/Private/Streamer/AIStreamBuffer.m +++ b/ApiAI/Private/Streamer/AIStreamBuffer.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIStreamBuffer.h" @interface AIStreamBuffer () diff --git a/ApiAI/Private/Streamer/AIStreamBufferDelegate.h b/ApiAI/Private/Streamer/AIStreamBufferDelegate.h index 8d5f665..d7372ae 100644 --- a/ApiAI/Private/Streamer/AIStreamBufferDelegate.h +++ b/ApiAI/Private/Streamer/AIStreamBufferDelegate.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + @class AIStreamBuffer; @protocol AIStreamBufferDelegate diff --git a/ApiAI/Response/Classes/AIRequest+AIMappedResponse.h b/ApiAI/Response/Classes/AIRequest+AIMappedResponse.h index 4badc84..b793f85 100644 --- a/ApiAI/Response/Classes/AIRequest+AIMappedResponse.h +++ b/ApiAI/Response/Classes/AIRequest+AIMappedResponse.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequest.h" @interface AIRequest (AIMappedResponse) diff --git a/ApiAI/Response/Classes/AIRequest+AIMappedResponse.m b/ApiAI/Response/Classes/AIRequest+AIMappedResponse.m index 120b523..1284fce 100644 --- a/ApiAI/Response/Classes/AIRequest+AIMappedResponse.m +++ b/ApiAI/Response/Classes/AIRequest+AIMappedResponse.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequest+AIMappedResponse.h" #import "AIResponse.h" diff --git a/ApiAI/Response/Classes/AIResponse.h b/ApiAI/Response/Classes/AIResponse.h index a6d48cb..c1bec4f 100644 --- a/ApiAI/Response/Classes/AIResponse.h +++ b/ApiAI/Response/Classes/AIResponse.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AIRequest+AIMappedResponse.h" diff --git a/ApiAI/Response/Classes/AIResponse.m b/ApiAI/Response/Classes/AIResponse.m index 7049819..fd8f1ff 100644 --- a/ApiAI/Response/Classes/AIResponse.m +++ b/ApiAI/Response/Classes/AIResponse.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponse.h" #import "AIResponseStatus_Private.h" #import "AIResponseResult_Private.h" diff --git a/ApiAI/Response/Classes/AIResponseContext.h b/ApiAI/Response/Classes/AIResponseContext.h index 5e09b39..d7716fb 100644 --- a/ApiAI/Response/Classes/AIResponseContext.h +++ b/ApiAI/Response/Classes/AIResponseContext.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import /** diff --git a/ApiAI/Response/Classes/AIResponseContext.m b/ApiAI/Response/Classes/AIResponseContext.m index 5dbeff2..543598a 100644 --- a/ApiAI/Response/Classes/AIResponseContext.m +++ b/ApiAI/Response/Classes/AIResponseContext.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseContext.h" #import "AIResponseParameter_Private.h" diff --git a/ApiAI/Response/Classes/AIResponseFulfillment.h b/ApiAI/Response/Classes/AIResponseFulfillment.h index e7c625f..7926237 100644 --- a/ApiAI/Response/Classes/AIResponseFulfillment.h +++ b/ApiAI/Response/Classes/AIResponseFulfillment.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/Response/Classes/AIResponseFulfillment.m b/ApiAI/Response/Classes/AIResponseFulfillment.m index 84c337c..93bef01 100644 --- a/ApiAI/Response/Classes/AIResponseFulfillment.m +++ b/ApiAI/Response/Classes/AIResponseFulfillment.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseFulfillment.h" #import "AIResponseFulfillment_Private.h" diff --git a/ApiAI/Response/Classes/AIResponseMetadata.h b/ApiAI/Response/Classes/AIResponseMetadata.h index b1d7cf8..385fb39 100644 --- a/ApiAI/Response/Classes/AIResponseMetadata.h +++ b/ApiAI/Response/Classes/AIResponseMetadata.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import /** diff --git a/ApiAI/Response/Classes/AIResponseMetadata.m b/ApiAI/Response/Classes/AIResponseMetadata.m index ecef46e..c7dccc4 100644 --- a/ApiAI/Response/Classes/AIResponseMetadata.m +++ b/ApiAI/Response/Classes/AIResponseMetadata.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseMetadata.h" #import "AIResponseResult_Private.h" diff --git a/ApiAI/Response/Classes/AIResponseParameter.h b/ApiAI/Response/Classes/AIResponseParameter.h index 62d8e6d..d16b3b0 100644 --- a/ApiAI/Response/Classes/AIResponseParameter.h +++ b/ApiAI/Response/Classes/AIResponseParameter.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/Response/Classes/AIResponseParameter.m b/ApiAI/Response/Classes/AIResponseParameter.m index 8b67a9d..2568947 100644 --- a/ApiAI/Response/Classes/AIResponseParameter.m +++ b/ApiAI/Response/Classes/AIResponseParameter.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseParameter.h" #import "AIResponseParameterConstants.h" diff --git a/ApiAI/Response/Classes/AIResponseResult.h b/ApiAI/Response/Classes/AIResponseResult.h index 5237e28..48d0deb 100644 --- a/ApiAI/Response/Classes/AIResponseResult.h +++ b/ApiAI/Response/Classes/AIResponseResult.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseMetadata.h" #import "AIResponseParameter.h" #import "AIResponseFulfillment.h" diff --git a/ApiAI/Response/Classes/AIResponseResult.m b/ApiAI/Response/Classes/AIResponseResult.m index cff5ddc..71a7169 100644 --- a/ApiAI/Response/Classes/AIResponseResult.m +++ b/ApiAI/Response/Classes/AIResponseResult.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseResult.h" #import "AIResponseStatus_Private.h" #import "AIResponseMetadata_Private.h" diff --git a/ApiAI/Response/Classes/AIResponseStatus.h b/ApiAI/Response/Classes/AIResponseStatus.h index e9e1372..8a86205 100644 --- a/ApiAI/Response/Classes/AIResponseStatus.h +++ b/ApiAI/Response/Classes/AIResponseStatus.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** - * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== - * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai - * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * http://www.apache.org/licenses/LICENSE-2.0 + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. + * http://www.apache.org/licenses/LICENSE-2.0 * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseConstants.h" @interface AIResponseStatus : NSObject diff --git a/ApiAI/Response/Classes/AIResponseStatus.m b/ApiAI/Response/Classes/AIResponseStatus.m index 3ac3400..1134e9d 100644 --- a/ApiAI/Response/Classes/AIResponseStatus.m +++ b/ApiAI/Response/Classes/AIResponseStatus.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseStatus.h" NSInteger const kAISuccessfullCode = 200; diff --git a/ApiAI/Response/Private/AIResponseContext_Private.h b/ApiAI/Response/Private/AIResponseContext_Private.h index 12856ae..3646be3 100644 --- a/ApiAI/Response/Private/AIResponseContext_Private.h +++ b/ApiAI/Response/Private/AIResponseContext_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseContext.h" @interface AIResponseContext () diff --git a/ApiAI/Response/Private/AIResponseFulfillment_Private.h b/ApiAI/Response/Private/AIResponseFulfillment_Private.h index cd8d401..0a13421 100644 --- a/ApiAI/Response/Private/AIResponseFulfillment_Private.h +++ b/ApiAI/Response/Private/AIResponseFulfillment_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseFulfillment.h" @interface AIResponseFulfillment () diff --git a/ApiAI/Response/Private/AIResponseMetadata_Private.h b/ApiAI/Response/Private/AIResponseMetadata_Private.h index 3a5a482..e8a6f21 100644 --- a/ApiAI/Response/Private/AIResponseMetadata_Private.h +++ b/ApiAI/Response/Private/AIResponseMetadata_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseMetadata.h" @interface AIResponseMetadata () diff --git a/ApiAI/Response/Private/AIResponseParameterConstants.h b/ApiAI/Response/Private/AIResponseParameterConstants.h index a43c06e..671795b 100644 --- a/ApiAI/Response/Private/AIResponseParameterConstants.h +++ b/ApiAI/Response/Private/AIResponseParameterConstants.h @@ -1,11 +1,19 @@ -// -// AIResponseParameterConstants.h -// ApiAI -// -// Created by Kuragin Dmitriy on 16/01/2017. -// Copyright © 2017 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/Response/Private/AIResponseParameterConstants.m b/ApiAI/Response/Private/AIResponseParameterConstants.m index 135696f..8ba0e93 100644 --- a/ApiAI/Response/Private/AIResponseParameterConstants.m +++ b/ApiAI/Response/Private/AIResponseParameterConstants.m @@ -1,11 +1,19 @@ -// -// AIResponseParameterConstants.m -// ApiAI -// -// Created by Kuragin Dmitriy on 16/01/2017. -// Copyright © 2017 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseParameterConstants.h" diff --git a/ApiAI/Response/Private/AIResponseParameter_Private.h b/ApiAI/Response/Private/AIResponseParameter_Private.h index d6262f9..2774f8c 100644 --- a/ApiAI/Response/Private/AIResponseParameter_Private.h +++ b/ApiAI/Response/Private/AIResponseParameter_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseParameter.h" @interface AIResponseParameter () diff --git a/ApiAI/Response/Private/AIResponseResult_Private.h b/ApiAI/Response/Private/AIResponseResult_Private.h index d8b5184..8fe153b 100644 --- a/ApiAI/Response/Private/AIResponseResult_Private.h +++ b/ApiAI/Response/Private/AIResponseResult_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseResult.h" @interface AIResponseResult () diff --git a/ApiAI/Response/Private/AIResponseStatus_Private.h b/ApiAI/Response/Private/AIResponseStatus_Private.h index be83af8..2b3d6a7 100644 --- a/ApiAI/Response/Private/AIResponseStatus_Private.h +++ b/ApiAI/Response/Private/AIResponseStatus_Private.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIResponseStatus.h" @interface AIResponseStatus () diff --git a/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.h b/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.h index c5a9598..eb42678 100644 --- a/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.h +++ b/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AIDatePeriodFormatter : NSFormatter diff --git a/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.m b/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.m index 30ea083..1ec200d 100644 --- a/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.m +++ b/ApiAI/Response/Private/Formatters/AIDatePeriodFormatter.m @@ -1,11 +1,19 @@ -// -// DatePeriodFormatter.m -// AIWrapRespProject -// -// Created by Kuragin Dmitriy on 06/05/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIDatePeriodFormatter.h" @implementation AIDatePeriodFormatter diff --git a/ApiAI/UIKit/Classes/AIVoiceRequestButton.h b/ApiAI/UIKit/Classes/AIVoiceRequestButton.h index 90d79a3..5787e58 100644 --- a/ApiAI/UIKit/Classes/AIVoiceRequestButton.h +++ b/ApiAI/UIKit/Classes/AIVoiceRequestButton.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AINullabilityDefines.h" diff --git a/ApiAI/UIKit/Classes/AIVoiceRequestButton.m b/ApiAI/UIKit/Classes/AIVoiceRequestButton.m index 08d97d5..ecfefb4 100644 --- a/ApiAI/UIKit/Classes/AIVoiceRequestButton.m +++ b/ApiAI/UIKit/Classes/AIVoiceRequestButton.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIVoiceRequestButton.h" #import "AIVoiceLevelView.h" #import "AIVoiceContainerView.h" diff --git a/ApiAI/UIKit/Private/AIEllipseView.h b/ApiAI/UIKit/Private/AIEllipseView.h index 3ba27a0..b22cd19 100644 --- a/ApiAI/UIKit/Private/AIEllipseView.h +++ b/ApiAI/UIKit/Private/AIEllipseView.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import IB_DESIGNABLE diff --git a/ApiAI/UIKit/Private/AIEllipseView.m b/ApiAI/UIKit/Private/AIEllipseView.m index f722288..1c3bd8d 100644 --- a/ApiAI/UIKit/Private/AIEllipseView.m +++ b/ApiAI/UIKit/Private/AIEllipseView.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIEllipseView.h" @interface AIEllipseLayer : CALayer diff --git a/ApiAI/UIKit/Private/AIProgressView.h b/ApiAI/UIKit/Private/AIProgressView.h index 757ea4f..d634418 100644 --- a/ApiAI/UIKit/Private/AIProgressView.h +++ b/ApiAI/UIKit/Private/AIProgressView.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AIProgressView : UIView diff --git a/ApiAI/UIKit/Private/AIProgressView.m b/ApiAI/UIKit/Private/AIProgressView.m index aaa954d..da7e942 100644 --- a/ApiAI/UIKit/Private/AIProgressView.m +++ b/ApiAI/UIKit/Private/AIProgressView.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIProgressView.h" NSString *const kAIProgressAnimationKey = @"AIProgressAnimationKey"; diff --git a/ApiAI/UIKit/Private/AIVoiceContainerView.h b/ApiAI/UIKit/Private/AIVoiceContainerView.h index 4112833..4e0af0c 100644 --- a/ApiAI/UIKit/Private/AIVoiceContainerView.h +++ b/ApiAI/UIKit/Private/AIVoiceContainerView.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AIVoiceContainerView : UIView diff --git a/ApiAI/UIKit/Private/AIVoiceContainerView.m b/ApiAI/UIKit/Private/AIVoiceContainerView.m index e342cdc..9aac56d 100644 --- a/ApiAI/UIKit/Private/AIVoiceContainerView.m +++ b/ApiAI/UIKit/Private/AIVoiceContainerView.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIVoiceContainerView.h" @implementation AIVoiceContainerView diff --git a/ApiAI/UIKit/Private/AIVoiceLevelView.h b/ApiAI/UIKit/Private/AIVoiceLevelView.h index 298df9d..c3714d1 100644 --- a/ApiAI/UIKit/Private/AIVoiceLevelView.h +++ b/ApiAI/UIKit/Private/AIVoiceLevelView.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AIVoiceLevelView : UIView diff --git a/ApiAI/UIKit/Private/AIVoiceLevelView.m b/ApiAI/UIKit/Private/AIVoiceLevelView.m index ddac66e..2edd2eb 100644 --- a/ApiAI/UIKit/Private/AIVoiceLevelView.m +++ b/ApiAI/UIKit/Private/AIVoiceLevelView.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIVoiceLevelView.h" @interface AIVoiceLevelLayer : CALayer diff --git a/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.h b/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.h index 52f1820..1e426fc 100644 --- a/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.h +++ b/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.h @@ -1,10 +1,19 @@ -// -// AIUserEntitiesRequest.h -// ApiAI -// -// Created by Kuragin Dmitriy on 11/01/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRequest.h" #import "AIUserEntity.h" diff --git a/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.m b/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.m index 29bb47c..afda2a5 100644 --- a/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.m +++ b/ApiAI/UserEntities/Classes/AIUserEntitiesRequest.m @@ -1,10 +1,19 @@ -// -// AIUserEntitiesRequest.m -// ApiAI -// -// Created by Kuragin Dmitriy on 11/01/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIUserEntitiesRequest.h" #import "AISessionIdentifierStorage.h" diff --git a/ApiAI/UserEntities/Classes/AIUserEntity.h b/ApiAI/UserEntities/Classes/AIUserEntity.h index 196d4a5..fb44a3b 100644 --- a/ApiAI/UserEntities/Classes/AIUserEntity.h +++ b/ApiAI/UserEntities/Classes/AIUserEntity.h @@ -1,10 +1,19 @@ -// -// AIUserEntity.h -// ApiAI -// -// Created by Kuragin Dmitriy on 11/01/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import diff --git a/ApiAI/UserEntities/Classes/AIUserEntity.m b/ApiAI/UserEntities/Classes/AIUserEntity.m index 894a644..6526cda 100644 --- a/ApiAI/UserEntities/Classes/AIUserEntity.m +++ b/ApiAI/UserEntities/Classes/AIUserEntity.m @@ -1,10 +1,19 @@ -// -// AIUserEntity.m -// ApiAI -// -// Created by Kuragin Dmitriy on 11/01/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIUserEntity.h" #import "AIUserEntity_Private.h" diff --git a/ApiAI/UserEntities/Private/AIUserEntity_Private.h b/ApiAI/UserEntities/Private/AIUserEntity_Private.h index 9e560ce..d88c6e9 100644 --- a/ApiAI/UserEntities/Private/AIUserEntity_Private.h +++ b/ApiAI/UserEntities/Private/AIUserEntity_Private.h @@ -1,10 +1,19 @@ -// -// AIUserEntity+Private.h -// ApiAI -// -// Created by Kuragin Dmitriy on 11/01/16. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIUserEntity.h" diff --git a/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.h b/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.h index 73b31e5..b02ff12 100644 --- a/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.h +++ b/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.h @@ -1,11 +1,19 @@ -// -// AIVoiceFileRequest.h -// ApiAI -// -// Created by Kuragin Dmitriy on 28/07/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIQueryRequest.h" /*! diff --git a/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.m b/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.m index c433310..30582c6 100644 --- a/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.m +++ b/ApiAI/VoiceFileRequest/Classes/AIVoiceFileRequest.m @@ -1,10 +1,19 @@ -// -// AIVoiceFileRequest.m -// ApiAI -// -// Created by Kuragin Dmitriy on 28/07/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIVoiceFileRequest.h" #import "AIVoiceFileRequest_Private.h" diff --git a/ApiAI/VoiceFileRequest/Private/AIVoiceFileRequest_Private.h b/ApiAI/VoiceFileRequest/Private/AIVoiceFileRequest_Private.h index c475f61..b9998c8 100644 --- a/ApiAI/VoiceFileRequest/Private/AIVoiceFileRequest_Private.h +++ b/ApiAI/VoiceFileRequest/Private/AIVoiceFileRequest_Private.h @@ -1,10 +1,19 @@ -// -// AIVoiceFileRequest_Private.h -// ApiAI -// -// Created by Kuragin Dmitriy on 30/07/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIVoiceFileRequest.h" diff --git a/ApiAI/VoiceRequest/Classes/AIVoiceRequest.h b/ApiAI/VoiceRequest/Classes/AIVoiceRequest.h index d3ea0bb..c9057d0 100644 --- a/ApiAI/VoiceRequest/Classes/AIVoiceRequest.h +++ b/ApiAI/VoiceRequest/Classes/AIVoiceRequest.h @@ -1,24 +1,20 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ -#import "AIQueryRequest.h" + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #import "AIQueryRequest.h" /*! * Sound level handler definition for AIVoiceRequest. diff --git a/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m b/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m index 8db7d27..6c4518a 100644 --- a/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m +++ b/ApiAI/VoiceRequest/Classes/AIVoiceRequest.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIVoiceRequest.h" #import "AIDataService.h" #import "AIRecordDetector.h" diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.h b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.h index 5032435..ca52c09 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.h +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIAlgorithmDetectorDelegate.h" #import "AIAlgorithmDetectorTypes.h" diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.m b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.m index fb641ab..18ff656 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.m +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetector.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIAlgorithmDetector.h" @implementation AIAlgorithmDetector diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorDelegate.h b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorDelegate.h index 25497ae..f3f34c0 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorDelegate.h +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorDelegate.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIAlgorithmDetectorTypes.h" @class AIAlgorithmDetector; diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorTypes.h b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorTypes.h index 2edc3f4..477b766 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorTypes.h +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/AIAlgorithmDetectorTypes.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import typedef enum _AIAlgorithmDetectorResult { diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.h b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.h index 05d02e2..0ccbe26 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.h +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIAlgorithmDetector.h" @interface AdaptiveThresold : AIAlgorithmDetector diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.m b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.m index 25d41df..5d1fa6c 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.m +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/AdaptiveThresold/AdaptiveThresold.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AdaptiveThresold.h" @interface AdaptiveThresold () diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.h b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.h index 002c14c..dffea39 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.h +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIAlgorithmDetector.h" @interface EnergyAndZeroCross : AIAlgorithmDetector diff --git a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.m b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.m index 7407367..27e8a2d 100644 --- a/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.m +++ b/ApiAI/VoiceRequest/Private/AlgorithmDetector/Algorithms/EnergyAndZeroCross/EnergyAndZeroCross.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "EnergyAndZeroCross.h" @interface EnergyAndZeroCross() diff --git a/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.h b/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.h index d810dfc..6c09ae9 100755 --- a/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.h +++ b/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRecordDetectorDelegate.h" @interface AIRecordDetector : NSObject diff --git a/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.m b/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.m index 6286c55..524107a 100755 --- a/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.m +++ b/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetector.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIRecordDetector.h" #import "AIAlgorithmDetector.h" #import "AISoundRecorder.h" diff --git a/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetectorDelegate.h b/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetectorDelegate.h index 097f164..6cbe59a 100644 --- a/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetectorDelegate.h +++ b/ApiAI/VoiceRequest/Private/RecordDetector/AIRecordDetectorDelegate.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @class AIRecordDetector; diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.c b/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.c index 6093d99..32264d3 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.c +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.c @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "AIAudioUtils.h" OSStatus AICAError(OSStatus result, const char *file, int line) diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.h b/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.h index ab10076..7275740 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.h +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AIAudioUtils.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #ifndef __MySpeaker__AudioUtils__ #define __MySpeaker__AudioUtils__ diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.h b/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.h index 315a711..4e37348 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.h +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.h @@ -1,23 +1,18 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.m b/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.m index e3958cd..f18962e 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.m +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AIMeterTable.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AIMeterTable.h" #import "AIAudioUtils.h" diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.h b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.h index 65f19ac..8990bbf 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.h +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AISoundRecorderDelegate.h" @interface AISoundRecorder : NSObject diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.m b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.m index 240d7a1..c305b2a 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.m +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorder.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AISoundRecorder.h" #import "AISoundRecorderConstants.h" #import "AIAudioUtils.h" diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.h b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.h index 5e4fb13..808e334 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.h +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #pragma mark - diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.m b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.m index c11dfe8..0d39e80 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.m +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderConstants.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AISoundRecorderConstants.h" @import CoreAudio; diff --git a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderDelegate.h b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderDelegate.h index 6313804..85cf398 100644 --- a/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderDelegate.h +++ b/ApiAI/VoiceRequest/Private/SoundRecorder/AISoundRecorderDelegate.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import diff --git a/ApiAIDemo/ApiAI/ApiAIDemo-Prefix.pch b/ApiAIDemo/ApiAI/ApiAIDemo-Prefix.pch index 548ca7c..4d36796 100644 --- a/ApiAIDemo/ApiAI/ApiAIDemo-Prefix.pch +++ b/ApiAIDemo/ApiAI/ApiAIDemo-Prefix.pch @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2014 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #ifndef __IPHONE_5_0 diff --git a/ApiAIDemo/ApiAI/AppDelegate.h b/ApiAIDemo/ApiAI/AppDelegate.h index efbfb20..5a1af0c 100644 --- a/ApiAIDemo/ApiAI/AppDelegate.h +++ b/ApiAIDemo/ApiAI/AppDelegate.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2014 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AppDelegate : UIResponder diff --git a/ApiAIDemo/ApiAI/AppDelegate.m b/ApiAIDemo/ApiAI/AppDelegate.m index 1a960bc..d84c66b 100644 --- a/ApiAIDemo/ApiAI/AppDelegate.m +++ b/ApiAIDemo/ApiAI/AppDelegate.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2014 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AppDelegate.h" #import diff --git a/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.h b/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.h index 19b3e6c..c46494b 100644 --- a/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.h +++ b/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface MappedResponseViewController : UIViewController diff --git a/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.m b/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.m index c90539d..ca7e079 100644 --- a/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.m +++ b/ApiAIDemo/ApiAI/MappedResponseViewController/MappedResponseViewController.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "MappedResponseViewController.h" #import diff --git a/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.h b/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.h index fcd594d..8c5ba3a 100644 --- a/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.h +++ b/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface ResultNavigarionController : UINavigationController diff --git a/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.m b/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.m index 0fe2b2e..87c7659 100644 --- a/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.m +++ b/ApiAIDemo/ApiAI/ResultViewController/ResultNavigarionController.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ResultNavigarionController.h" #import "ResultViewController.h" diff --git a/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.h b/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.h index ff1a8c1..ca81614 100644 --- a/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.h +++ b/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.h @@ -1,23 +1,18 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import diff --git a/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.m b/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.m index 21b0021..bf4473a 100644 --- a/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.m +++ b/ApiAIDemo/ApiAI/ResultViewController/ResultViewController.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ResultViewController.h" @interface ResultViewController () diff --git a/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.h b/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.h index 858c77d..14f162b 100644 --- a/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.h +++ b/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface TextRequestViewController : UIViewController diff --git a/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.m b/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.m index 03b29e6..50e7d33 100644 --- a/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.m +++ b/ApiAIDemo/ApiAI/TextRequestViewController/TextRequestViewController.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "TextRequestViewController.h" #import "ResultNavigarionController.h" diff --git a/ApiAIDemo/ApiAI/main.m b/ApiAIDemo/ApiAI/main.m index 52e578a..035212d 100644 --- a/ApiAIDemo/ApiAI/main.m +++ b/ApiAIDemo/ApiAI/main.m @@ -1,10 +1,19 @@ -// -// main.m -// OpenAPIDemo -// -// Created by Kuragin Dmitriy on 06/06/14. -// Copyright (c) 2014 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import diff --git a/ApiAIDemoSwift/ApiAIDemoSwift/ApiAIDemoSwift-Bridging-Header.h b/ApiAIDemoSwift/ApiAIDemoSwift/ApiAIDemoSwift-Bridging-Header.h index d27a936..e63c96e 100644 --- a/ApiAIDemoSwift/ApiAIDemoSwift/ApiAIDemoSwift-Bridging-Header.h +++ b/ApiAIDemoSwift/ApiAIDemoSwift/ApiAIDemoSwift-Bridging-Header.h @@ -1,7 +1,19 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import #import diff --git a/ApiAIDemoSwift/ApiAIDemoSwift/AppDelegate.swift b/ApiAIDemoSwift/ApiAIDemoSwift/AppDelegate.swift index 46fed29..b84178e 100644 --- a/ApiAIDemoSwift/ApiAIDemoSwift/AppDelegate.swift +++ b/ApiAIDemoSwift/ApiAIDemoSwift/AppDelegate.swift @@ -1,11 +1,19 @@ -// -// AppDelegate.swift -// ApiAIDemoSwift -// -// Created by Kuragin Dmitriy on 25/03/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit import AVFoundation diff --git a/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultNavigationController.swift b/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultNavigationController.swift index f96ae1b..fe57be1 100644 --- a/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultNavigationController.swift +++ b/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultNavigationController.swift @@ -1,11 +1,19 @@ -// -// ResultNavigationController.swift -// ApiAIDemoSwift -// -// Created by Kuragin Dmitriy on 25/03/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit class ResultNavigationController: UINavigationController { diff --git a/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultViewController.swift b/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultViewController.swift index c860b1e..f184758 100644 --- a/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultViewController.swift +++ b/ApiAIDemoSwift/ApiAIDemoSwift/ResultViewController/ResultViewController.swift @@ -1,10 +1,19 @@ -// -// ResultViewController.swift -// ApiAIDemoSwift -// -// Created by Kuragin Dmitriy on 25/03/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit diff --git a/ApiAIDemoSwift/ApiAIDemoSwift/TextRequestViewController/TextRequestViewController.swift b/ApiAIDemoSwift/ApiAIDemoSwift/TextRequestViewController/TextRequestViewController.swift index 8a00a54..6089bd8 100644 --- a/ApiAIDemoSwift/ApiAIDemoSwift/TextRequestViewController/TextRequestViewController.swift +++ b/ApiAIDemoSwift/ApiAIDemoSwift/TextRequestViewController/TextRequestViewController.swift @@ -1,11 +1,19 @@ -// -// TextRequestViewController.swift -// ApiAIDemoSwift -// -// Created by Kuragin Dmitriy on 25/03/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit class TextRequestViewController: UIViewController { diff --git a/ApiAIDemoSwift/ApiAIDemoSwiftTests/ApiAIDemoSwiftTests.swift b/ApiAIDemoSwift/ApiAIDemoSwiftTests/ApiAIDemoSwiftTests.swift index ceb6593..41d757f 100644 --- a/ApiAIDemoSwift/ApiAIDemoSwiftTests/ApiAIDemoSwiftTests.swift +++ b/ApiAIDemoSwift/ApiAIDemoSwiftTests/ApiAIDemoSwiftTests.swift @@ -1,10 +1,19 @@ -// -// ApiAIDemoSwiftTests.swift -// ApiAIDemoSwiftTests -// -// Created by Kuragin Dmitriy on 25/03/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit import XCTest diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.h b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.h index e9c3695..9838395 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.h +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.h @@ -1,24 +1,20 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ -#import + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + #import @interface ExtensionDelegate : NSObject diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.m b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.m index 29e81af..0a42e85 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.m +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/ExtensionDelegate.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ExtensionDelegate.h" #import diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.h b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.h index 5ee54bc..619fad8 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.h +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.m b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.m index 4ece088..3ed0714 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.m +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS WatchKit Extension/InterfaceController.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "InterfaceController.h" #import #import diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.h b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.h index 9f052ae..d12823c 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.h +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AppDelegate : UIResponder diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.m b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.m index 057d0f0..24fbbd9 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.m +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/AppDelegate.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AppDelegate.h" @interface AppDelegate () diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.h b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.h index 2c6b3d6..9e9ebe6 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.h +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.h @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface ViewController : UIViewController diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.m b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.m index 5e747bc..139a44a 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.m +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/ViewController.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ViewController.h" @interface ViewController () diff --git a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/main.m b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/main.m index e944f37..6d05709 100644 --- a/ApiAIDemoWatchOS/ApiAIDemoWatchOS/main.m +++ b/ApiAIDemoWatchOS/ApiAIDemoWatchOS/main.m @@ -1,10 +1,19 @@ -// -// main.m -// ApiAIDemoWatchOS -// -// Created by Kuragin Dmitriy on 28/07/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AppDelegate.h" diff --git a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/ExtensionDelegate.swift b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/ExtensionDelegate.swift index e865cb0..2a6e377 100644 --- a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/ExtensionDelegate.swift +++ b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/ExtensionDelegate.swift @@ -1,10 +1,19 @@ -// -// ExtensionDelegate.swift -// ApiAIDemoWatchOSSwift WatchKit Extension -// -// Created by Kuragin Dmitriy on 21/10/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import WatchKit import ApiAI diff --git a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/InterfaceController.swift b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/InterfaceController.swift index 1eccdb3..6f67a75 100644 --- a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/InterfaceController.swift +++ b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift WatchKit Extension/InterfaceController.swift @@ -1,10 +1,19 @@ -// -// InterfaceController.swift -// ApiAIDemoWatchOSSwift WatchKit Extension -// -// Created by Kuragin Dmitriy on 21/10/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import WatchKit import Foundation diff --git a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/AppDelegate.swift b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/AppDelegate.swift index d6f6578..0131518 100644 --- a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/AppDelegate.swift +++ b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/AppDelegate.swift @@ -1,10 +1,19 @@ -// -// AppDelegate.swift -// ApiAIDemoWatchOSSwift -// -// Created by Kuragin Dmitriy on 21/10/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit import ApiAI diff --git a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/ViewController.swift b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/ViewController.swift index f4e15d6..5b2e1c1 100644 --- a/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/ViewController.swift +++ b/ApiAIDemoWatchOSSwift/ApiAIDemoWatchOSSwift/ViewController.swift @@ -1,10 +1,19 @@ -// -// ViewController.swift -// ApiAIDemoWatchOSSwift -// -// Created by Kuragin Dmitriy on 21/10/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import UIKit diff --git a/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.h b/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.h index 66f9830..5bf9e73 100644 --- a/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.h +++ b/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.h @@ -1,11 +1,19 @@ -// -// AppDelegate.h -// ApiAIMacOSDemo -// -// Created by Kuragin Dmitriy on 25/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import @interface AppDelegate : NSObject diff --git a/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.m b/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.m index 03a9665..f97ba72 100644 --- a/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.m +++ b/ApiAIMacOSDemo/ApiAIMacOSDemo/AppDelegate.m @@ -1,10 +1,19 @@ -// -// AppDelegate.m -// ApiAIMacOSDemo -// -// Created by Kuragin Dmitriy on 25/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AppDelegate.h" #import diff --git a/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.h b/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.h index e41984a..95b7353 100644 --- a/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.h +++ b/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.h @@ -1,10 +1,18 @@ -// -// ViewController.h -// ApiAIMacOSDemo -// -// Created by Kuragin Dmitriy on 25/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import diff --git a/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.m b/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.m index da3e07f..6e38530 100644 --- a/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.m +++ b/ApiAIMacOSDemo/ApiAIMacOSDemo/ViewController.m @@ -1,11 +1,19 @@ -// -// ViewController.m -// ApiAIMacOSDemo -// -// Created by Kuragin Dmitriy on 25/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "ViewController.h" #import diff --git a/ApiAIMacOSDemo/ApiAIMacOSDemo/main.m b/ApiAIMacOSDemo/ApiAIMacOSDemo/main.m index 30ec675..7108839 100644 --- a/ApiAIMacOSDemo/ApiAIMacOSDemo/main.m +++ b/ApiAIMacOSDemo/ApiAIMacOSDemo/main.m @@ -1,10 +1,18 @@ -// -// main.m -// ApiAIMacOSDemo -// -// Created by Kuragin Dmitriy on 25/09/15. -// Copyright © 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ #import diff --git a/ApiAITests/AIVADTest.m b/ApiAITests/AIVADTest.m index 217b376..75eadd7 100644 --- a/ApiAITests/AIVADTest.m +++ b/ApiAITests/AIVADTest.m @@ -1,10 +1,19 @@ -// -// AIVADTest.m -// ApiAI -// -// Created by Kuragin Dmitriy on 23/06/15. -// Copyright (c) 2015 Kuragin Dmitriy. All rights reserved. -// +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import diff --git a/ApiAITests/ApiAITests.m b/ApiAITests/ApiAITests.m index 37af2a3..1216e2a 100644 --- a/ApiAITests/ApiAITests.m +++ b/ApiAITests/ApiAITests.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import diff --git a/ApiAITests/AudioFileReader.h b/ApiAITests/AudioFileReader.h index ea580a2..6f6e66a 100644 --- a/ApiAITests/AudioFileReader.h +++ b/ApiAITests/AudioFileReader.h @@ -1,11 +1,19 @@ -// -// AudioFileReader.h -// Assistant -// -// Created by Dmitriy Kuragin on 11/8/13. -// Copyright (c) 2013 SpeakToIt. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import diff --git a/ApiAITests/AudioFileReader.m b/ApiAITests/AudioFileReader.m index f4b7902..9ea049f 100644 --- a/ApiAITests/AudioFileReader.m +++ b/ApiAITests/AudioFileReader.m @@ -1,11 +1,19 @@ -// -// AudioFileReader.m -// Assistant -// -// Created by Dmitriy Kuragin on 11/8/13. -// Copyright (c) 2013 SpeakToIt. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import "AudioFileReader.h" @interface AudioFileReader() diff --git a/ApiAITests/EventsTests.m b/ApiAITests/EventsTests.m index 1f36857..fc983d4 100644 --- a/ApiAITests/EventsTests.m +++ b/ApiAITests/EventsTests.m @@ -1,11 +1,19 @@ -// -// EventsTests.m -// ApiAI -// -// Created by Kuragin Dmitriy on 09/12/2016. -// Copyright © 2016 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "ApiAI.h" diff --git a/ApiAITests/SerializationTests.m b/ApiAITests/SerializationTests.m index 0a94950..a5a9c02 100644 --- a/ApiAITests/SerializationTests.m +++ b/ApiAITests/SerializationTests.m @@ -1,11 +1,19 @@ -// -// SerializationTests.m -// ApiAI -// -// Created by Kuragin Dmitriy on 16/01/2017. -// Copyright © 2017 Kuragin Dmitriy. All rights reserved. -// - +/** + * Copyright 2017 Google Inc. All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "AIResponseParameter.h" diff --git a/ApiAITests/UserEntitiesTests.m b/ApiAITests/UserEntitiesTests.m index 8432ef4..769ccc8 100644 --- a/ApiAITests/UserEntitiesTests.m +++ b/ApiAITests/UserEntitiesTests.m @@ -1,24 +1,19 @@ -/*********************************************************************************************************************** +/** + * Copyright 2017 Google Inc. All Rights Reserved. * - * API.AI iOS SDK - client-side libraries for API.AI - * ========================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Copyright (C) 2015 by Speaktoit, Inc. (https://www.speaktoit.com) - * https://www.api.ai + * http://www.apache.org/licenses/LICENSE-2.0 * - *********************************************************************************************************************** - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - * - ***********************************************************************************************************************/ - + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #import #import "ApiAI.h" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..520f32e --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,32 @@ +# How to become a contributor and submit your own code + +## Contributor License Agreements + +We'd love to accept your sample apps and patches! Before we can take them, we +have to jump a couple of legal hurdles. + +Please fill out either the individual or corporate Contributor License Agreement +(CLA). + + * If you are an individual writing original source code and you're sure you + own the intellectual property, then you'll need to sign an [individual CLA](https://developers.google.com/open-source/cla/individual). + * If you work for a company that wants to allow you to contribute your work, + then you'll need to sign a [corporate CLA](https://developers.google.com/open-source/cla/corporate). + +Follow either of the two links above to access the appropriate CLA and +instructions for how to sign and return it. Once we receive it, we'll be able to +accept your pull requests. + +## Contributing A Patch + +1. Submit an issue describing your proposed change to the repo in question. +1. The repo owner will respond to your issue promptly. +1. If your proposed change is accepted, and you haven't already done so, sign a + Contributor License Agreement (see details above). +1. Fork the desired repo, develop and test your code changes. +1. Ensure that your code adheres to the existing style in the sample to which + you are contributing. Refer to the + [Google Cloud Platform Samples Style Guide](https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the + recommended coding standards for this organization. +1. Ensure that your code has an appropriate set of unit tests which all pass. +1. Submit a pull request. diff --git a/LICENSE b/LICENSE index b5b9748..8405e89 100644 --- a/LICENSE +++ b/LICENSE @@ -1,13 +1,191 @@ -Copyright 2014 Speaktoit, Inc. +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - http://www.apache.org/licenses/LICENSE-2.0 +1. Definitions. -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +"License" shall mean the terms and conditions for use, reproduction, and +distribution as defined by Sections 1 through 9 of this document. + +"Licensor" shall mean the copyright owner or entity authorized by the copyright +owner that is granting the License. + +"Legal Entity" shall mean the union of the acting entity and all other entities +that control, are controlled by, or are under common control with that entity. +For the purposes of this definition, "control" means (i) the power, direct or +indirect, to cause the direction or management of such entity, whether by +contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the +outstanding shares, or (iii) beneficial ownership of such entity. + +"You" (or "Your") shall mean an individual or Legal Entity exercising +permissions granted by this License. + +"Source" form shall mean the preferred form for making modifications, including +but not limited to software source code, documentation source, and configuration +files. + +"Object" form shall mean any form resulting from mechanical transformation or +translation of a Source form, including but not limited to compiled object code, +generated documentation, and conversions to other media types. + +"Work" shall mean the work of authorship, whether in Source or Object form, made +available under the License, as indicated by a copyright notice that is included +in or attached to the work (an example is provided in the Appendix below). + +"Derivative Works" shall mean any work, whether in Source or Object form, that +is based on (or derived from) the Work and for which the editorial revisions, +annotations, elaborations, or other modifications represent, as a whole, an +original work of authorship. For the purposes of this License, Derivative Works +shall not include works that remain separable from, or merely link (or bind by +name) to the interfaces of, the Work and Derivative Works thereof. + +"Contribution" shall mean any work of authorship, including the original version +of the Work and any modifications or additions to that Work or Derivative Works +thereof, that is intentionally submitted to Licensor for inclusion in the Work +by the copyright owner or by an individual or Legal Entity authorized to submit +on behalf of the copyright owner. For the purposes of this definition, +"submitted" means any form of electronic, verbal, or written communication sent +to the Licensor or its representatives, including but not limited to +communication on electronic mailing lists, source code control systems, and +issue tracking systems that are managed by, or on behalf of, the Licensor for +the purpose of discussing and improving the Work, but excluding communication +that is conspicuously marked or otherwise designated in writing by the copyright +owner as "Not a Contribution." + +"Contributor" shall mean Licensor and any individual or Legal Entity on behalf +of whom a Contribution has been received by Licensor and subsequently +incorporated within the Work. + +2. Grant of Copyright License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable copyright license to reproduce, prepare Derivative Works of, +publicly display, publicly perform, sublicense, and distribute the Work and such +Derivative Works in Source or Object form. + +3. Grant of Patent License. + +Subject to the terms and conditions of this License, each Contributor hereby +grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, +irrevocable (except as stated in this section) patent license to make, have +made, use, offer to sell, sell, import, and otherwise transfer the Work, where +such license applies only to those patent claims licensable by such Contributor +that are necessarily infringed by their Contribution(s) alone or by combination +of their Contribution(s) with the Work to which such Contribution(s) was +submitted. If You institute patent litigation against any entity (including a +cross-claim or counterclaim in a lawsuit) alleging that the Work or a +Contribution incorporated within the Work constitutes direct or contributory +patent infringement, then any patent licenses granted to You under this License +for that Work shall terminate as of the date such litigation is filed. + +4. Redistribution. + +You may reproduce and distribute copies of the Work or Derivative Works thereof +in any medium, with or without modifications, and in Source or Object form, +provided that You meet the following conditions: + +You must give any other recipients of the Work or Derivative Works a copy of +this License; and +You must cause any modified files to carry prominent notices stating that You +changed the files; and +You must retain, in the Source form of any Derivative Works that You distribute, +all copyright, patent, trademark, and attribution notices from the Source form +of the Work, excluding those notices that do not pertain to any part of the +Derivative Works; and +If the Work includes a "NOTICE" text file as part of its distribution, then any +Derivative Works that You distribute must include a readable copy of the +attribution notices contained within such NOTICE file, excluding those notices +that do not pertain to any part of the Derivative Works, in at least one of the +following places: within a NOTICE text file distributed as part of the +Derivative Works; within the Source form or documentation, if provided along +with the Derivative Works; or, within a display generated by the Derivative +Works, if and wherever such third-party notices normally appear. The contents of +the NOTICE file are for informational purposes only and do not modify the +License. You may add Your own attribution notices within Derivative Works that +You distribute, alongside or as an addendum to the NOTICE text from the Work, +provided that such additional attribution notices cannot be construed as +modifying the License. +You may add Your own copyright statement to Your modifications and may provide +additional or different license terms and conditions for use, reproduction, or +distribution of Your modifications, or for any such Derivative Works as a whole, +provided Your use, reproduction, and distribution of the Work otherwise complies +with the conditions stated in this License. + +5. Submission of Contributions. + +Unless You explicitly state otherwise, any Contribution intentionally submitted +for inclusion in the Work by You to the Licensor shall be under the terms and +conditions of this License, without any additional terms or conditions. +Notwithstanding the above, nothing herein shall supersede or modify the terms of +any separate license agreement you may have executed with Licensor regarding +such Contributions. + +6. Trademarks. + +This License does not grant permission to use the trade names, trademarks, +service marks, or product names of the Licensor, except as required for +reasonable and customary use in describing the origin of the Work and +reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. + +Unless required by applicable law or agreed to in writing, Licensor provides the +Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, +including, without limitation, any warranties or conditions of TITLE, +NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are +solely responsible for determining the appropriateness of using or +redistributing the Work and assume any risks associated with Your exercise of +permissions under this License. + +8. Limitation of Liability. + +In no event and under no legal theory, whether in tort (including negligence), +contract, or otherwise, unless required by applicable law (such as deliberate +and grossly negligent acts) or agreed to in writing, shall any Contributor be +liable to You for damages, including any direct, indirect, special, incidental, +or consequential damages of any character arising as a result of this License or +out of the use or inability to use the Work (including but not limited to +damages for loss of goodwill, work stoppage, computer failure or malfunction, or +any and all other commercial damages or losses), even if such Contributor has +been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. + +While redistributing the Work or Derivative Works thereof, You may choose to +offer, and charge a fee for, acceptance of support, warranty, indemnity, or +other liability obligations and/or rights consistent with this License. However, +in accepting such obligations, You may act only on Your own behalf and on Your +sole responsibility, not on behalf of any other Contributor, and only if You +agree to indemnify, defend, and hold each Contributor harmless for any liability +incurred by, or claims asserted against, such Contributor by reason of your +accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work + +To apply the Apache License to your work, attach the following boilerplate +notice, with the fields enclosed by brackets "[]" replaced with your own +identifying information. (Don't include the brackets!) The text should be +enclosed in the appropriate comment syntax for the file format. We also +recommend that a file or class name and description of purpose be included on +the same "printed page" as the copyright notice for easier identification within +third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 51f358e..4b4803c 100644 --- a/README.md +++ b/README.md @@ -81,3 +81,13 @@ The API.AI Objective-C(Cocoa) SDK makes it easy to integrate speech recognition [_apiAI enqueue:request]; ``` +## How to make contributions? +Please read and follow the steps in the [CONTRIBUTING.md](CONTRIBUTING.md). + +## License +See [LICENSE](LICENSE). + +## Terms +Your use of this sample is subject to, and by using or downloading the sample files you agree to comply with, the [Google APIs Terms of Service](https://developers.google.com/terms/). + +This is not an official Google product. \ No newline at end of file From 705e927a586757dc4bdb70e1c7495677d244a996 Mon Sep 17 00:00:00 2001 From: Matt Carroll Date: Wed, 20 Feb 2019 10:55:05 -0800 Subject: [PATCH 7/7] Add deprecation notice --- README.md | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4b4803c..a762cd9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ -Objective-C(Cocoa) SDK for api.ai -============== +# DEPRECATED Objective-C(Cocoa) SDK for api.ai + +| Deprecated | +|-------| +| This Dialogflow client library and Dialogflow API V1 [have been deprecated and will be shut down on October 23th, 2019](https://blog.dialogflow.com/post/migrate-to-dialogflow-api-v2/). Please [migrate to Dialogflow API V2](https://cloud.google.com/dialogflow-enterprise/docs/migrating). | [![Build Status](https://travis-ci.org/api-ai/api-ai-ios-sdk.svg)](https://travis-ci.org/api-ai/api-ai-ios-sdk) [![Version](https://img.shields.io/cocoapods/v/ApiAI.svg?style=flat)](http://cocoapods.org/pods/ApiAI) @@ -90,4 +93,4 @@ See [LICENSE](LICENSE). ## Terms Your use of this sample is subject to, and by using or downloading the sample files you agree to comply with, the [Google APIs Terms of Service](https://developers.google.com/terms/). -This is not an official Google product. \ No newline at end of file +This is not an official Google product.