diff --git a/bin/configs/swift5-any-codable.yaml b/bin/configs/swift5-any-codable.yaml index 62031951b9e..d61bcef3997 100644 --- a/bin/configs/swift5-any-codable.yaml +++ b/bin/configs/swift5-any-codable.yaml @@ -1,5 +1,5 @@ generatorName: swift5 -outputDir: samples/client/petstore/swift5/anycodable +outputDir: samples/client/petstore/swift5/anycodableLibrary inputSpec: modules/openapi-generator/src/test/resources/3_0/any_codable.yaml modelNamePrefix: Prefix modelNameSuffix: Suffix diff --git a/bitrise.yml b/bitrise.yml index d2961951748..0f8b81e2450 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -30,4 +30,4 @@ workflows: meta: bitrise.io: - stack: osx-xcode-14.2.x + stack: osx-xcode-14.3.x-ventura diff --git a/samples/client/petstore/swift5/anycodable/.gitignore b/samples/client/petstore/swift5/anycodableLibrary/.gitignore similarity index 100% rename from samples/client/petstore/swift5/anycodable/.gitignore rename to samples/client/petstore/swift5/anycodableLibrary/.gitignore diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator-ignore b/samples/client/petstore/swift5/anycodableLibrary/.openapi-generator-ignore similarity index 100% rename from samples/client/petstore/swift5/anycodable/.openapi-generator-ignore rename to samples/client/petstore/swift5/anycodableLibrary/.openapi-generator-ignore diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator/FILES b/samples/client/petstore/swift5/anycodableLibrary/.openapi-generator/FILES similarity index 100% rename from samples/client/petstore/swift5/anycodable/.openapi-generator/FILES rename to samples/client/petstore/swift5/anycodableLibrary/.openapi-generator/FILES diff --git a/samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION b/samples/client/petstore/swift5/anycodableLibrary/.openapi-generator/VERSION similarity index 100% rename from samples/client/petstore/swift5/anycodable/.openapi-generator/VERSION rename to samples/client/petstore/swift5/anycodableLibrary/.openapi-generator/VERSION diff --git a/samples/client/petstore/swift5/anycodable/.swiftformat b/samples/client/petstore/swift5/anycodableLibrary/.swiftformat similarity index 100% rename from samples/client/petstore/swift5/anycodable/.swiftformat rename to samples/client/petstore/swift5/anycodableLibrary/.swiftformat diff --git a/samples/client/petstore/swift5/anycodable/Cartfile b/samples/client/petstore/swift5/anycodableLibrary/Cartfile similarity index 100% rename from samples/client/petstore/swift5/anycodable/Cartfile rename to samples/client/petstore/swift5/anycodableLibrary/Cartfile diff --git a/samples/client/petstore/swift5/anycodable/OpenAPIClient.podspec b/samples/client/petstore/swift5/anycodableLibrary/OpenAPIClient.podspec similarity index 100% rename from samples/client/petstore/swift5/anycodable/OpenAPIClient.podspec rename to samples/client/petstore/swift5/anycodableLibrary/OpenAPIClient.podspec diff --git a/samples/client/petstore/swift5/anycodable/Package.swift b/samples/client/petstore/swift5/anycodableLibrary/Package.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/Package.swift rename to samples/client/petstore/swift5/anycodableLibrary/Package.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient.podspec b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient.podspec similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient.podspec rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient.podspec diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIHelper.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIHelper.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIs.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/APIs/PetsAPI.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Configuration.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Configuration.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Extensions.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Extensions.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/JSONDataEncoding.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Models.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Models/PrefixPetSuffix.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/OpenISO8601DateFormatter.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/SynchronizedDictionary.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/URLSessionImplementations.swift diff --git a/samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Validation.swift b/samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift similarity index 100% rename from samples/client/petstore/swift5/anycodable/PetstoreClient/Classes/OpenAPIs/Validation.swift rename to samples/client/petstore/swift5/anycodableLibrary/PetstoreClient/Classes/OpenAPIs/Validation.swift diff --git a/samples/client/petstore/swift5/anycodable/README.md b/samples/client/petstore/swift5/anycodableLibrary/README.md similarity index 100% rename from samples/client/petstore/swift5/anycodable/README.md rename to samples/client/petstore/swift5/anycodableLibrary/README.md diff --git a/samples/client/petstore/swift5/anycodable/docs/PetsAPI.md b/samples/client/petstore/swift5/anycodableLibrary/docs/PetsAPI.md similarity index 100% rename from samples/client/petstore/swift5/anycodable/docs/PetsAPI.md rename to samples/client/petstore/swift5/anycodableLibrary/docs/PetsAPI.md diff --git a/samples/client/petstore/swift5/anycodable/docs/PrefixPetSuffix.md b/samples/client/petstore/swift5/anycodableLibrary/docs/PrefixPetSuffix.md similarity index 100% rename from samples/client/petstore/swift5/anycodable/docs/PrefixPetSuffix.md rename to samples/client/petstore/swift5/anycodableLibrary/docs/PrefixPetSuffix.md diff --git a/samples/client/petstore/swift5/anycodable/git_push.sh b/samples/client/petstore/swift5/anycodableLibrary/git_push.sh similarity index 100% rename from samples/client/petstore/swift5/anycodable/git_push.sh rename to samples/client/petstore/swift5/anycodableLibrary/git_push.sh diff --git a/samples/client/petstore/swift5/anycodable/pom.xml b/samples/client/petstore/swift5/anycodableLibrary/pom.xml similarity index 100% rename from samples/client/petstore/swift5/anycodable/pom.xml rename to samples/client/petstore/swift5/anycodableLibrary/pom.xml diff --git a/samples/client/petstore/swift5/anycodable/project.yml b/samples/client/petstore/swift5/anycodableLibrary/project.yml similarity index 100% rename from samples/client/petstore/swift5/anycodable/project.yml rename to samples/client/petstore/swift5/anycodableLibrary/project.yml diff --git a/samples/client/petstore/swift5/anycodable/run_spmbuild.sh b/samples/client/petstore/swift5/anycodableLibrary/run_spmbuild.sh similarity index 100% rename from samples/client/petstore/swift5/anycodable/run_spmbuild.sh rename to samples/client/petstore/swift5/anycodableLibrary/run_spmbuild.sh diff --git a/samples/client/petstore/swift5/swift5_test_all.sh b/samples/client/petstore/swift5/swift5_test_all.sh index 902a476ef7d..86004513ba0 100755 --- a/samples/client/petstore/swift5/swift5_test_all.sh +++ b/samples/client/petstore/swift5/swift5_test_all.sh @@ -4,29 +4,30 @@ set -e DIRECTORY=`dirname $0` # example project with unit tests -mvn -f $DIRECTORY/alamofireLibrary/SwaggerClientTests/pom.xml integration-test -mvn -f $DIRECTORY/asyncAwaitLibrary/SwaggerClientTests/pom.xml integration-test -mvn -f $DIRECTORY/combineLibrary/SwaggerClientTests/pom.xml integration-test -mvn -f $DIRECTORY/default/SwaggerClientTests/pom.xml integration-test -mvn -f $DIRECTORY/promisekitLibrary/SwaggerClientTests/pom.xml integration-test -mvn -f $DIRECTORY/rxswiftLibrary/SwaggerClientTests/pom.xml integration-test -mvn -f $DIRECTORY/urlsessionLibrary/SwaggerClientTests/pom.xml integration-test +(cd $DIRECTORY/alamofireLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +(cd $DIRECTORY/asyncAwaitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +(cd $DIRECTORY/combineLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +(cd $DIRECTORY/default/SwaggerClientTests/ && ./run_xcodebuild.sh) +(cd $DIRECTORY/promisekitLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +(cd $DIRECTORY/rxswiftLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) +(cd $DIRECTORY/urlsessionLibrary/SwaggerClientTests/ && ./run_xcodebuild.sh) # spm build -mvn -f $DIRECTORY/alamofireLibrary/pom.xml integration-test -mvn -f $DIRECTORY/anycodable/pom.xml integration-test -mvn -f $DIRECTORY/asyncAwaitLibrary/pom.xml integration-test -mvn -f $DIRECTORY/combineLibrary/pom.xml integration-test -mvn -f $DIRECTORY/default/pom.xml integration-test -mvn -f $DIRECTORY/deprecated/pom.xml integration-test -mvn -f $DIRECTORY/frozenEnums/pom.xml integration-test -mvn -f $DIRECTORY/nonPublicApi/pom.xml integration-test -mvn -f $DIRECTORY/objcCompatible/pom.xml integration-test -mvn -f $DIRECTORY/oneOf/pom.xml integration-test -mvn -f $DIRECTORY/promisekitLibrary/pom.xml integration-test -mvn -f $DIRECTORY/readonlyProperties/pom.xml integration-test -mvn -f $DIRECTORY/resultLibrary/pom.xml integration-test -mvn -f $DIRECTORY/rxswiftLibrary/pom.xml integration-test -mvn -f $DIRECTORY/urlsessionLibrary/pom.xml integration-test -# mvn -f $DIRECTORY/vaporLibrary/pom.xml integration-test -mvn -f $DIRECTORY/x-swift-hashable/pom.xml integration-test +(cd $DIRECTORY/alamofireLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/anycodableLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/asyncAwaitLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/combineLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/default/ && ./run_spmbuild.sh) +(cd $DIRECTORY/deprecated/ && ./run_spmbuild.sh) +(cd $DIRECTORY/frozenEnums/ && ./run_spmbuild.sh) +(cd $DIRECTORY/nonPublicApi/ && ./run_spmbuild.sh) +(cd $DIRECTORY/objcCompatible/ && ./run_spmbuild.sh) +(cd $DIRECTORY/oneOf/ && ./run_spmbuild.sh) +(cd $DIRECTORY/promisekitLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/readonlyProperties/ && ./run_spmbuild.sh) +(cd $DIRECTORY/resultLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/rxswiftLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/urlsessionLibrary/ && ./run_spmbuild.sh) +#(cd $DIRECTORY/vaporLibrary/ && ./run_spmbuild.sh) +(cd $DIRECTORY/x-swift-hashable/ && ./run_spmbuild.sh) +