diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java index f0c0a8ffa8..01f72040bf 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/ObjcClientCodegen.java @@ -20,7 +20,7 @@ public class ObjcClientCodegen extends DefaultCodegen implements CodegenConfig { protected Set foundationClasses = new HashSet(); protected String sourceFolder = "client"; protected String classPrefix = "SWG"; - protected String projectName = "swaggerClient"; + protected String projectName = "SwaggerClient"; public ObjcClientCodegen() { super(); diff --git a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout b/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout deleted file mode 100644 index fafd21fb8e..0000000000 --- a/samples/client/petstore/objc/PetstoreClient.xcworkspace/xcshareddata/PetstoreClient.xccheckout +++ /dev/null @@ -1,41 +0,0 @@ - - - - - IDESourceControlProjectFavoriteDictionaryKey - - IDESourceControlProjectIdentifier - 81EB09FA-DD8C-4FE1-82D3-1FB6FF0D9C43 - IDESourceControlProjectName - PetstoreClient - IDESourceControlProjectOriginsDictionary - - E5BBF0AA85077C865C95437976D06D819733A208 - ssh://github.com/wordnik/swagger-codegen.git - - IDESourceControlProjectPath - samples/client/petstore/objc/PetstoreClient.xcworkspace - IDESourceControlProjectRelativeInstallPathDictionary - - E5BBF0AA85077C865C95437976D06D819733A208 - ../../../../.. - - IDESourceControlProjectURL - ssh://github.com/wordnik/swagger-codegen.git - IDESourceControlProjectVersion - 111 - IDESourceControlProjectWCCIdentifier - E5BBF0AA85077C865C95437976D06D819733A208 - IDESourceControlProjectWCConfigurations - - - IDESourceControlRepositoryExtensionIdentifierKey - public.vcs.git - IDESourceControlWCCIdentifierKey - E5BBF0AA85077C865C95437976D06D819733A208 - IDESourceControlWCCName - swagger-codegen - - - - diff --git a/samples/client/petstore/objc/Podfile b/samples/client/petstore/objc/Podfile index 69e4c26ca1..ad41463f60 100644 --- a/samples/client/petstore/objc/Podfile +++ b/samples/client/petstore/objc/Podfile @@ -1,5 +1,5 @@ platform :ios, '6.0' -xcodeproj 'swaggerClient/PetstoreClient.xcodeproj' +xcodeproj 'SwaggerClient/SwaggerClient.xcodeproj' pod 'AFNetworking', '~> 2.1' pod 'JSONModel', '~> 1.0' pod 'ISO8601' diff --git a/samples/client/petstore/objc/Podfile.lock b/samples/client/petstore/objc/Podfile.lock index ceb0fad1a4..48b1f80965 100644 --- a/samples/client/petstore/objc/Podfile.lock +++ b/samples/client/petstore/objc/Podfile.lock @@ -1,11 +1,11 @@ PODS: - AFNetworking (2.5.4): - - AFNetworking/NSURLConnection - - AFNetworking/NSURLSession - - AFNetworking/Reachability - - AFNetworking/Security - - AFNetworking/Serialization - - AFNetworking/UIKit + - AFNetworking/NSURLConnection (= 2.5.4) + - AFNetworking/NSURLSession (= 2.5.4) + - AFNetworking/Reachability (= 2.5.4) + - AFNetworking/Security (= 2.5.4) + - AFNetworking/Serialization (= 2.5.4) + - AFNetworking/UIKit (= 2.5.4) - AFNetworking/NSURLConnection (2.5.4): - AFNetworking/Reachability - AFNetworking/Security @@ -33,4 +33,4 @@ SPEC CHECKSUMS: ISO8601: 8d8a22d5edf0554a1cf75bac028c76c1dc0ffaef JSONModel: ec77e9865236a7a09d9cf7668df6b4b328d9ec1d -COCOAPODS: 0.33.1 +COCOAPODS: 0.37.1 diff --git a/samples/client/petstore/objc/PetstoreClient.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/objc/SwaggerClient.xcworkspace/contents.xcworkspacedata similarity index 73% rename from samples/client/petstore/objc/PetstoreClient.xcworkspace/contents.xcworkspacedata rename to samples/client/petstore/objc/SwaggerClient.xcworkspace/contents.xcworkspacedata index 4ea1511917..4fa5c7f565 100644 --- a/samples/client/petstore/objc/PetstoreClient.xcworkspace/contents.xcworkspacedata +++ b/samples/client/petstore/objc/SwaggerClient.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:SwaggerClient/SwaggerClient.xcodeproj"> diff --git a/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000..79012184db Binary files /dev/null and b/samples/client/petstore/objc/SwaggerClient.xcworkspace/xcuserdata/geekerzp.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.pbxproj similarity index 91% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.pbxproj index 5c1bfabf60..ae903f2749 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.pbxproj +++ b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.pbxproj @@ -63,14 +63,14 @@ CFD1B66E1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "JSONValueTransformer+ISO8601.h"; sourceTree = ""; }; CFD1B66F1B05EC7D00DCCD51 /* JSONValueTransformer+ISO8601.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "JSONValueTransformer+ISO8601.m"; sourceTree = ""; }; E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "../Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = ""; }; - EA6699961811D2FA00A70D03 /* PetstoreClient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PetstoreClient.app; sourceTree = BUILT_PRODUCTS_DIR; }; + EA6699961811D2FA00A70D03 /* SwaggerClient.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SwaggerClient.app; sourceTree = BUILT_PRODUCTS_DIR; }; EA6699991811D2FA00A70D03 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; EA66999B1811D2FA00A70D03 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; EA66999D1811D2FA00A70D03 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; - EA6699A11811D2FA00A70D03 /* PetstoreClient-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PetstoreClient-Info.plist"; sourceTree = ""; }; + EA6699A11811D2FA00A70D03 /* SwaggerClient-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SwaggerClient-Info.plist"; sourceTree = ""; }; EA6699A31811D2FA00A70D03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; EA6699A51811D2FA00A70D03 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - EA6699A71811D2FA00A70D03 /* PetstoreClient-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PetstoreClient-Prefix.pch"; sourceTree = ""; }; + EA6699A71811D2FA00A70D03 /* SwaggerClient-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SwaggerClient-Prefix.pch"; sourceTree = ""; }; EA6699A81811D2FA00A70D03 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; EA6699A91811D2FA00A70D03 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; EA6699AC1811D2FA00A70D03 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main_iPhone.storyboard; sourceTree = ""; }; @@ -78,8 +78,8 @@ EA6699B11811D2FA00A70D03 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; EA6699B21811D2FA00A70D03 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; EA6699B41811D2FA00A70D03 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = ""; }; - EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = PetstoreClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - EA6699C31811D2FB00A70D03 /* PetstoreClientTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "PetstoreClientTests-Info.plist"; sourceTree = ""; }; + EA6699BA1811D2FB00A70D03 /* SwaggerClientTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SwaggerClientTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + EA6699C31811D2FB00A70D03 /* SwaggerClientTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "SwaggerClientTests-Info.plist"; sourceTree = ""; }; EA6699C51811D2FB00A70D03 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; EA6699C71811D2FB00A70D03 /* PetApiTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PetApiTest.m; sourceTree = ""; }; EA8B8AA21AC6683700638FBB /* SWGQueryParamCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWGQueryParamCollection.h; sourceTree = ""; }; @@ -151,8 +151,8 @@ isa = PBXGroup; children = ( EAEA85CB1811D3AE00F06E69 /* client */, - EA66999F1811D2FA00A70D03 /* PetstoreClient */, - EA6699C11811D2FB00A70D03 /* PetstoreClientTests */, + EA66999F1811D2FA00A70D03 /* SwaggerClient */, + EA6699C11811D2FB00A70D03 /* SwaggerClientTests */, EA6699981811D2FA00A70D03 /* Frameworks */, EA6699971811D2FA00A70D03 /* Products */, 1A15B3DE4358A178ABAEC251 /* Pods */, @@ -162,8 +162,8 @@ EA6699971811D2FA00A70D03 /* Products */ = { isa = PBXGroup; children = ( - EA6699961811D2FA00A70D03 /* PetstoreClient.app */, - EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */, + EA6699961811D2FA00A70D03 /* SwaggerClient.app */, + EA6699BA1811D2FB00A70D03 /* SwaggerClientTests.xctest */, ); name = Products; sourceTree = ""; @@ -181,7 +181,7 @@ name = Frameworks; sourceTree = ""; }; - EA66999F1811D2FA00A70D03 /* PetstoreClient */ = { + EA66999F1811D2FA00A70D03 /* SwaggerClient */ = { isa = PBXGroup; children = ( EA6699A81811D2FA00A70D03 /* AppDelegate.h */, @@ -193,22 +193,22 @@ EA6699B41811D2FA00A70D03 /* Images.xcassets */, EA6699A01811D2FA00A70D03 /* Supporting Files */, ); - path = PetstoreClient; + path = SwaggerClient; sourceTree = ""; }; EA6699A01811D2FA00A70D03 /* Supporting Files */ = { isa = PBXGroup; children = ( EAFBEABA1A925B8500A27431 /* test-1.png */, - EA6699A11811D2FA00A70D03 /* PetstoreClient-Info.plist */, + EA6699A11811D2FA00A70D03 /* SwaggerClient-Info.plist */, EA6699A21811D2FA00A70D03 /* InfoPlist.strings */, EA6699A51811D2FA00A70D03 /* main.m */, - EA6699A71811D2FA00A70D03 /* PetstoreClient-Prefix.pch */, + EA6699A71811D2FA00A70D03 /* SwaggerClient-Prefix.pch */, ); name = "Supporting Files"; sourceTree = ""; }; - EA6699C11811D2FB00A70D03 /* PetstoreClientTests */ = { + EA6699C11811D2FB00A70D03 /* SwaggerClientTests */ = { isa = PBXGroup; children = ( EA8CD3EB1AC274BE00C47D0B /* PetApiTest.h */, @@ -216,13 +216,13 @@ EA6699C71811D2FB00A70D03 /* PetApiTest.m */, EA6699C21811D2FB00A70D03 /* Supporting Files */, ); - path = PetstoreClientTests; + path = SwaggerClientTests; sourceTree = ""; }; EA6699C21811D2FB00A70D03 /* Supporting Files */ = { isa = PBXGroup; children = ( - EA6699C31811D2FB00A70D03 /* PetstoreClientTests-Info.plist */, + EA6699C31811D2FB00A70D03 /* SwaggerClientTests-Info.plist */, EA6699C41811D2FB00A70D03 /* InfoPlist.strings */, ); name = "Supporting Files"; @@ -267,9 +267,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - EA6699951811D2FA00A70D03 /* PetstoreClient */ = { + EA6699951811D2FA00A70D03 /* SwaggerClient */ = { isa = PBXNativeTarget; - buildConfigurationList = EA6699CB1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClient" */; + buildConfigurationList = EA6699CB1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "SwaggerClient" */; buildPhases = ( 04DAA264FD78471BBAD25173 /* Check Pods Manifest.lock */, EA6699921811D2FA00A70D03 /* Sources */, @@ -281,14 +281,14 @@ ); dependencies = ( ); - name = PetstoreClient; + name = SwaggerClient; productName = PetstoreClient; - productReference = EA6699961811D2FA00A70D03 /* PetstoreClient.app */; + productReference = EA6699961811D2FA00A70D03 /* SwaggerClient.app */; productType = "com.apple.product-type.application"; }; - EA6699B91811D2FB00A70D03 /* PetstoreClientTests */ = { + EA6699B91811D2FB00A70D03 /* SwaggerClientTests */ = { isa = PBXNativeTarget; - buildConfigurationList = EA6699CE1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClientTests" */; + buildConfigurationList = EA6699CE1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "SwaggerClientTests" */; buildPhases = ( EA6699B61811D2FB00A70D03 /* Sources */, EA6699B71811D2FB00A70D03 /* Frameworks */, @@ -299,9 +299,9 @@ dependencies = ( EA6699C01811D2FB00A70D03 /* PBXTargetDependency */, ); - name = PetstoreClientTests; + name = SwaggerClientTests; productName = PetstoreClientTests; - productReference = EA6699BA1811D2FB00A70D03 /* PetstoreClientTests.xctest */; + productReference = EA6699BA1811D2FB00A70D03 /* SwaggerClientTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -319,7 +319,7 @@ }; }; }; - buildConfigurationList = EA6699911811D2FA00A70D03 /* Build configuration list for PBXProject "PetstoreClient" */; + buildConfigurationList = EA6699911811D2FA00A70D03 /* Build configuration list for PBXProject "SwaggerClient" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -332,8 +332,8 @@ projectDirPath = ""; projectRoot = ""; targets = ( - EA6699951811D2FA00A70D03 /* PetstoreClient */, - EA6699B91811D2FB00A70D03 /* PetstoreClientTests */, + EA6699951811D2FA00A70D03 /* SwaggerClient */, + EA6699B91811D2FB00A70D03 /* SwaggerClientTests */, ); }; /* End PBXProject section */ @@ -435,7 +435,7 @@ /* Begin PBXTargetDependency section */ EA6699C01811D2FB00A70D03 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = EA6699951811D2FA00A70D03 /* PetstoreClient */; + target = EA6699951811D2FA00A70D03 /* SwaggerClient */; targetProxy = EA6699BF1811D2FB00A70D03 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -557,13 +557,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch"; - INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist"; + GCC_PREFIX_HEADER = "SwaggerClient/SwaggerClient-Prefix.pch"; + INFOPLIST_FILE = "SwaggerClient/SwaggerClient-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = SwaggerClient; WRAPPER_EXTENSION = app; }; name = Debug; @@ -575,13 +575,13 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch"; - INFOPLIST_FILE = "PetstoreClient/PetstoreClient-Info.plist"; + GCC_PREFIX_HEADER = "SwaggerClient/SwaggerClient-Prefix.pch"; + INFOPLIST_FILE = "SwaggerClient/SwaggerClient-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = SwaggerClient; WRAPPER_EXTENSION = app; }; name = Release; @@ -591,24 +591,24 @@ baseConfigurationReference = E2B6DA00BE52336E23783686 /* Pods.debug.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient"; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SwaggerClient.app/SwaggerClient"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch"; + GCC_PREFIX_HEADER = "SwaggerClient/SwaggerClient-Prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist"; + INFOPLIST_FILE = "SwaggerClientTests/SwaggerClientTests-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = SwaggerClientTests; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -619,20 +619,20 @@ baseConfigurationReference = A425648B5C0A4849C7668069 /* Pods.release.xcconfig */; buildSettings = { ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; - BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/PetstoreClient.app/PetstoreClient"; + BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/SwaggerClient.app/SwaggerClient"; FRAMEWORK_SEARCH_PATHS = ( "$(SDKROOT)/Developer/Library/Frameworks", "$(inherited)", "$(DEVELOPER_FRAMEWORKS_DIR)", ); GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "PetstoreClient/PetstoreClient-Prefix.pch"; - INFOPLIST_FILE = "PetstoreClientTests/PetstoreClientTests-Info.plist"; + GCC_PREFIX_HEADER = "SwaggerClient/SwaggerClient-Prefix.pch"; + INFOPLIST_FILE = "SwaggerClientTests/SwaggerClientTests-Info.plist"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "/Users/tony/dev/projects/swagger-api/swagger-codegen/samples/client/petstore/objc/Pods/../build/Debug-iphoneos", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = SwaggerClientTests; TEST_HOST = "$(BUNDLE_LOADER)"; WRAPPER_EXTENSION = xctest; }; @@ -641,7 +641,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - EA6699911811D2FA00A70D03 /* Build configuration list for PBXProject "PetstoreClient" */ = { + EA6699911811D2FA00A70D03 /* Build configuration list for PBXProject "SwaggerClient" */ = { isa = XCConfigurationList; buildConfigurations = ( EA6699C91811D2FB00A70D03 /* Debug */, @@ -650,7 +650,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EA6699CB1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = { + EA6699CB1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "SwaggerClient" */ = { isa = XCConfigurationList; buildConfigurations = ( EA6699CC1811D2FB00A70D03 /* Debug */, @@ -659,7 +659,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EA6699CE1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "PetstoreClientTests" */ = { + EA6699CE1811D2FB00A70D03 /* Build configuration list for PBXNativeTarget "SwaggerClientTests" */ = { isa = XCConfigurationList; buildConfigurations = ( EA6699CF1811D2FB00A70D03 /* Debug */, diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.xcworkspace/xcshareddata/PetstoreClient.xccheckout diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/project.xcworkspace/xcuserdata/tony.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme similarity index 75% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/PetstoreClient.xcscheme rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme index 1a2a738abe..f79c2dc99a 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/PetstoreClient.xcscheme +++ b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcshareddata/xcschemes/SwaggerClient.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "SwaggerClient.app" + BlueprintName = "SwaggerClient" + ReferencedContainer = "container:SwaggerClient.xcodeproj"> + BuildableName = "SwaggerClientTests.xctest" + BlueprintName = "SwaggerClientTests" + ReferencedContainer = "container:SwaggerClient.xcodeproj"> @@ -47,9 +47,9 @@ + BuildableName = "SwaggerClientTests.xctest" + BlueprintName = "SwaggerClientTests" + ReferencedContainer = "container:SwaggerClient.xcodeproj"> @@ -57,9 +57,9 @@ + BuildableName = "SwaggerClient.app" + BlueprintName = "SwaggerClient" + ReferencedContainer = "container:SwaggerClient.xcodeproj"> @@ -77,9 +77,9 @@ + BuildableName = "SwaggerClient.app" + BlueprintName = "SwaggerClient" + ReferencedContainer = "container:SwaggerClient.xcodeproj"> @@ -96,9 +96,9 @@ + BuildableName = "SwaggerClient.app" + BlueprintName = "SwaggerClient" + ReferencedContainer = "container:SwaggerClient.xcodeproj"> diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 91% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist index 912710bdcc..a0145d5cea 100644 --- a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/geekerzp.xcuserdatad/xcschemes/xcschememanagement.plist @@ -4,7 +4,7 @@ SchemeUserState - PetstoreClient.xcscheme + SwaggerClient.xcscheme_^#shared#^_ orderHint 4 diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/PetstoreClient.xcscheme diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist b/samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient.xcodeproj/xcuserdata/tony.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/AppDelegate.h similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.h rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/AppDelegate.h diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/AppDelegate.m similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/AppDelegate.m rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/AppDelegate.m diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPad.storyboard b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/Base.lproj/Main_iPad.storyboard similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPad.storyboard rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/Base.lproj/Main_iPad.storyboard diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPhone.storyboard b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/Base.lproj/Main_iPhone.storyboard similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/Base.lproj/Main_iPhone.storyboard rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/Base.lproj/Main_iPhone.storyboard diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/AppIcon.appiconset/Contents.json rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/Images.xcassets/LaunchImage.launchimage/Contents.json similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/Images.xcassets/LaunchImage.launchimage/Contents.json rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/Images.xcassets/LaunchImage.launchimage/Contents.json diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Info.plist b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/SwaggerClient-Info.plist similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Info.plist rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/SwaggerClient-Info.plist diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Prefix.pch b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/SwaggerClient-Prefix.pch similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/PetstoreClient-Prefix.pch rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/SwaggerClient-Prefix.pch diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.h similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.h rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.h diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.m similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/ViewController.m rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/ViewController.m diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/en.lproj/InfoPlist.strings b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/en.lproj/InfoPlist.strings similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/en.lproj/InfoPlist.strings rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/en.lproj/InfoPlist.strings diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/main.m similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/main.m rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/main.m diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClient/test-1.png b/samples/client/petstore/objc/SwaggerClient/SwaggerClient/test-1.png similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClient/test-1.png rename to samples/client/petstore/objc/SwaggerClient/SwaggerClient/test-1.png diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.h b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/PetApiTest.h similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.h rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/PetApiTest.h diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/PetApiTest.m similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/PetApiTest.m diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/SWGApiClientTest.m b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/SWGApiClientTest.m similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/SWGApiClientTest.m rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/SWGApiClientTest.m diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetstoreClientTests-Info.plist b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/SwaggerClientTests-Info.plist similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetstoreClientTests-Info.plist rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/SwaggerClientTests-Info.plist diff --git a/samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/en.lproj/InfoPlist.strings b/samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/en.lproj/InfoPlist.strings similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/en.lproj/InfoPlist.strings rename to samples/client/petstore/objc/SwaggerClient/SwaggerClientTests/en.lproj/InfoPlist.strings diff --git a/samples/client/petstore/objc/PetstoreClient/pom.xml b/samples/client/petstore/objc/SwaggerClient/pom.xml similarity index 100% rename from samples/client/petstore/objc/PetstoreClient/pom.xml rename to samples/client/petstore/objc/SwaggerClient/pom.xml diff --git a/samples/client/petstore/objc/client/SWGPet.h b/samples/client/petstore/objc/client/SWGPet.h index 73ff540386..edd54e9f31 100644 --- a/samples/client/petstore/objc/client/SWGPet.h +++ b/samples/client/petstore/objc/client/SWGPet.h @@ -1,7 +1,7 @@ #import #import "SWGObject.h" -#import "SWGCategory.h" #import "SWGTag.h" +#import "SWGCategory.h" @protocol SWGPet diff --git a/samples/client/petstore/objc/client/SWGPetApi.m b/samples/client/petstore/objc/client/SWGPetApi.m index e35e462c73..c14da125af 100644 --- a/samples/client/petstore/objc/client/SWGPetApi.m +++ b/samples/client/petstore/objc/client/SWGPetApi.m @@ -544,7 +544,7 @@ static NSString * basePath = @"http://petstore.swagger.io/v2"; NSString *requestContentType = [SWGApiClient selectHeaderContentType:@[]]; // Authentication setting - NSArray *authSettings = @[@"petstore_auth", @"api_key"]; + NSArray *authSettings = @[@"api_key", @"petstore_auth"]; id bodyDictionary = nil; diff --git a/samples/client/petstore/objc/pom.xml b/samples/client/petstore/objc/pom.xml index 718ef5e1d6..85fc5ff613 100644 --- a/samples/client/petstore/objc/pom.xml +++ b/samples/client/petstore/objc/pom.xml @@ -49,9 +49,9 @@ xcodebuild -workspace - PetstoreClient.xcworkspace + SwaggerClient.xcworkspace -scheme - PetstoreClient + SwaggerClient test -destination platform=iOS Simulator,name=iPhone 6,OS=8.3