diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index b623da36bb..0000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,242 +0,0 @@ -version: 2.1 - -parameters: - xcode_version: - type: string - default: "13.4.1" - ios_current_version: - type: string - default: "15.5" - ios_previous_version: - type: string - default: "14.5" - ios_sdk: - type: string - default: "iphonesimulator15.5" - macos_version: # The user-facing version string for macOS builds - type: string - default: "12.3.1" - macos_sdk: # The full SDK string to use for macOS builds - type: string - default: "macosx12.3" - tvos_version: # The user-facing version string of tvOS builds - type: string - default: "15.4" - tvos_sdk: - type: string - default: "appletvsimulator15.4" - -commands: - integration_test_setup: - steps: - - restore_cache: - key: starwars-server - - restore_cache: - key: apollo-server-graphql-transport-ws - - common_test_setup - - run: - command: ./scripts/install-node-v12.sh - name: Install Node - - run: - command: ./scripts/install-or-update-starwars-server.sh - name: Install/Update StarWars Server - - run: - command: cd ../starwars-server && npm start - name: Start StarWars Server - background: true - - run: - command: cd SimpleUploadServer && nvm use && npm install && npm start - name: Start Upload Server - background: true - - run: - command: sudo chmod -R +rwx SimpleUploadServer - name: Adjust permissions for simple upload server folder - - run: - command: ./scripts/install-apollo-server-docs-example-server.sh - name: Install Apollo Server (graphql-transport-ws configuration) - - run: - command: cd ../docs-examples/apollo-server/v3/subscriptions-graphql-ws && npm start - name: Start Apollo Server (graphql-transport-ws configuration) - background: true - integration_test_cleanup: - steps: - - save_cache: - key: starwars-server - paths: - - ../starwars-server - - save_cache: - key: apollo-server-graphql-transport-ws - paths: - - ../docs-examples/apollo-server/v3/subscriptions-graphql-ws - common_test_setup: - description: Commands to run for setup of every set of tests - steps: - - checkout - - run: - command: rm ~/.ssh/id_rsa - name: Remove old SSH key - - run: - command: for ip in $(dig @8.8.8.8 bitbucket.org +short); do ssh-keyscan bitbucket.org,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - name: Bitbucket Key Workaround - - run: - command: for ip in $(dig @8.8.8.8 github.com +short); do ssh-keyscan github.com,$ip; ssh-keyscan $ip; done 2>/dev/null >> ~/.ssh/known_hosts || true - name: Github Key Workaround - build_and_run_tests: - steps: - - run: - command: xcodebuild clean build build-for-testing -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" -testPlan "${CIRCLE_XCODE_TEST_PLAN}" | xcpretty - name: Clean and build for testing - - run: - command: xcodebuild test-without-building -resultBundlePath ~/TestResults/ResultBundle.xcresult -project "Apollo.xcodeproj" -scheme "${CIRCLE_XCODE_SCHEME}" -sdk "${CIRCLE_XCODE_SDK}" -destination "${DESTINATION}" -testPlan "${CIRCLE_XCODE_TEST_PLAN}" | xcpretty - name: Run tests - - save-xcodebuild-artifacts - save-xcodebuild-artifacts: - description: Save artifacts logs, crash reports and test results generated by xcodebuild - steps: - - store_artifacts: - name: Save xcodebuild logs - path: logs - destination: logs - - store_artifacts: - name: Save crash logs - path: ~/Library/Logs/DiagnosticReports/ - destination: crashes - - run: - name: Zip result bundle - working_directory: ~/TestResults - command: zip -r ResultBundle.zip ResultBundle.xcresult - when: always - - store_artifacts: - name: Save test results - path: ~/TestResults/ResultBundle.zip - destination: results - -# Important! When adding a new job to `jobs`, make sure to define when it -# executes by also adding it to the `workflows` section below! -jobs: - Swift_Build: - macos: - xcode: << pipeline.parameters.xcode_version >> - steps: - - common_test_setup - - run: - command: swift build - - IntegrationTests_macOS_current: - macos: - xcode: << pipeline.parameters.xcode_version >> - environment: - DESTINATION: platform=macOS,arch=x86_64 - CIRCLE_XCODE_SCHEME: Apollo - CIRCLE_XCODE_TEST_PLAN: Apollo-IntegrationTestPlan - CIRCLE_XCODE_SDK: << pipeline.parameters.macos_sdk >> - steps: - - integration_test_setup - - build_and_run_tests - - integration_test_cleanup - - macOS_current: - macos: - xcode: << pipeline.parameters.xcode_version >> - environment: - DESTINATION: platform=macOS,arch=x86_64 - CIRCLE_XCODE_SCHEME: Apollo - CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan - CIRCLE_XCODE_SDK: << pipeline.parameters.macos_sdk >> - steps: - - common_test_setup - - build_and_run_tests - - iOS_current: - macos: - xcode: << pipeline.parameters.xcode_version >> - environment: - DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_current_version >>,name=iPhone 12 - CIRCLE_XCODE_SCHEME: Apollo - CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan - CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >> - steps: - - common_test_setup - - build_and_run_tests - - iOS_previous: - macos: - xcode: << pipeline.parameters.xcode_version >> - environment: - DESTINATION: platform=iOS Simulator,OS=<< pipeline.parameters.ios_previous_version >>,name=iPhone 12 - CIRCLE_XCODE_SCHEME: Apollo - CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan - CIRCLE_XCODE_SDK: << pipeline.parameters.ios_sdk >> - steps: - - common_test_setup - - build_and_run_tests - - tvOS_current: - macos: - xcode: << pipeline.parameters.xcode_version >> - environment: - DESTINATION: platform=tvOS Simulator,OS=<< pipeline.parameters.tvos_version >>,name=Apple TV - CIRCLE_XCODE_SCHEME: Apollo - CIRCLE_XCODE_TEST_PLAN: Apollo-CITestPlan - CIRCLE_XCODE_SDK: << pipeline.parameters.tvos_sdk >> - steps: - - common_test_setup - - build_and_run_tests - - CodegenLib_macOS_current: - macos: - xcode: << pipeline.parameters.xcode_version >> - environment: - DESTINATION: platform=macOS,arch=x86_64 - CIRCLE_XCODE_SCHEME: ApolloCodegenLib - CIRCLE_XCODE_TEST_PLAN: Apollo-CodegenTestPlan - CIRCLE_XCODE_SDK: << pipeline.parameters.macos_sdk >> - steps: - - common_test_setup - - build_and_run_tests - - CocoaPodsTrunk: - macos: - xcode: << pipeline.parameters.xcode_version >> - steps: - - checkout - # TODO: Remove when Circle updates the version of CP installed on their - # image to one that doesn't have /~https://github.com/CocoaPods/CocoaPods/issues/9176 - - run: pod repo add-cdn trunk 'https://cdn.cocoapods.org/' - - run: pod trunk push Apollo.podspec - - run: pod trunk me clean-sessions --all - -workflows: - version: 2 - # This workflow builds and tests the library across various operating systems and versions - build-and-test: - jobs: - - Swift_Build: - name: Build with SPM - - IntegrationTests_macOS_current: - name: Apollo Integration Tests macOS << pipeline.parameters.macos_version >> - - macOS_current: - name: Apollo macOS << pipeline.parameters.macos_version >> - - iOS_current: - name: Apollo iOS << pipeline.parameters.ios_current_version >> - - iOS_previous: - name: Apollo iOS << pipeline.parameters.ios_previous_version >> - - tvOS_current: - name: Apollo tvOS << pipeline.parameters.tvos_version >> - - CodegenLib_macOS_current: - name: Swift Code Generation - - CocoaPodsTrunk: - name: Push Podspec to CocoaPods Trunk - requires: - - Apollo macOS << pipeline.parameters.macos_version >> - - Apollo iOS << pipeline.parameters.ios_current_version >> - - Apollo iOS << pipeline.parameters.ios_previous_version >> - - Apollo tvOS << pipeline.parameters.tvos_version >> - - Swift Code Generation - filters: - # Only build semver tags - tags: - only: /((\d*)\.(\d*)\.(\d*)).*/ - # Don't run this on any branches - branches: - ignore: /.*/ diff --git a/.github/CODEOWNERS.md b/.github/CODEOWNERS.md deleted file mode 100644 index 0bcb000641..0000000000 --- a/.github/CODEOWNERS.md +++ /dev/null @@ -1,2 +0,0 @@ -# https://help.github.com/articles/about-code-owners/ -/docs/ @stephenbarlow \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/issue-template-bug.md b/.github/ISSUE_TEMPLATE/issue-template-bug.md deleted file mode 100644 index 1db722af21..0000000000 --- a/.github/ISSUE_TEMPLATE/issue-template-bug.md +++ /dev/null @@ -1,25 +0,0 @@ ---- -name: Bug report -about: Use this template for submitting bug reports. ---- - -## Bug report - -Please replace this line with a short description of the problem. Make sure you've read `CHANGELOG.md` in the root of the repo to make sure a new version hasn't already addressed your problem! - -## Versions - -Please fill in the versions you're currently using: - -- `apollo-ios` SDK version: -- Xcode version: -- Swift version: -- Package manager: - -## Steps to reproduce - -Please replace this line with steps to reproduce the problem. - -## Further details - -Please replace this line with any further details or context necessary to understand the problem. Delete this section if you don't have anything further to add. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/issue-template-feature-request.md b/.github/ISSUE_TEMPLATE/issue-template-feature-request.md deleted file mode 100644 index a45338fbcc..0000000000 --- a/.github/ISSUE_TEMPLATE/issue-template-feature-request.md +++ /dev/null @@ -1,21 +0,0 @@ ---- -name: Feature request -about: Use this template for requesting new features or significant changes to existing features. ---- - - -## Feature request - -Please replace this line with a short description of the feature you're requesting. - -## Motivation - -Please replace this line with an explanation for why you would like this feature added. - -## Proposed solution - -Please replace this line with any proposed solution you have already started to work on. Delete this section if you don't have a proposed solution. - -## Outstanding Questions - -Please replace this line with any known question marks around how your feature would work. Delete this section if you don't have any outstanding questions. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/issue-template-question.md b/.github/ISSUE_TEMPLATE/issue-template-question.md deleted file mode 100644 index 83d8897929..0000000000 --- a/.github/ISSUE_TEMPLATE/issue-template-question.md +++ /dev/null @@ -1,20 +0,0 @@ ---- -name: Question -about: Please don't use issues to ask questions, use our forums instead. -labels: question ---- - - -## Question - -Before you ask, check a few things to see if there might already be an answer: - -- [`CHANGELOG.md`](/~https://github.com/apollographql/apollo-ios/blob/main/CHANGELOG.md) has all the most recent changes -- We have [extensive documentation available](https://www.apollographql.com/docs/ios) (though we're always looking for ways to improve it!) - - -If neither of those have an answer for you, we have [community forums](https://community.apollographql.com) where our users can ask and answer questions - head on over there rather than opening an issue here please! - -## Seriously - -Use the [community forums](https://community.apollographql.com) for questions, please! 😇 \ No newline at end of file diff --git a/.github/PULL_REQUEST_TEMPLATE/pull-request-template-release.md b/.github/PULL_REQUEST_TEMPLATE/pull-request-template-release.md deleted file mode 100644 index f40729448f..0000000000 --- a/.github/PULL_REQUEST_TEMPLATE/pull-request-template-release.md +++ /dev/null @@ -1,26 +0,0 @@ -#### Diff -Example: [0.48.0...main](/~https://github.com/apollographql/apollo-ios/compare/0.48.0...main). - -#### Relevant changes: -* _List the highlight changes_ - -#### Things to do in this PR -- [ ] Update the version in [`Configuration/Shared/Project-Version.xcconfig`](/~https://github.com/apollographql/apollo-ios/blob/main/Configuration/Shared/Project-Version.xcconfig). -- [ ] Update [`CHANGELOG.md`](/~https://github.com/apollographql/apollo-ios/blob/main/CHANGELOG.md) with all relevant changes since the prior version. Please include PR numbers and mention contributors for external PR submissions. -- [ ] Run the Documentation Generator as noted in [`api-reference.md`](/~https://github.com/apollographql/apollo-ios/blob/main/docs/source/api-reference.md) to re-generate documentation from source for all included libraries. - -#### Other things to do before a release - _these need to be automated by CI_ -- [ ] Validate that `main` builds with a test Swift Package Manager project. -- [ ] Validate that `main` builds with a test CocoaPods project. -- [ ] Validate that `main` builds with a test Carthage project (make sure to use `--use-xcframeworks`). - -#### Things to do as part of releasing -- [ ] Add tag of format `major.minor.patch` to GitHub for SPM/Carthage. -- [ ] Create a release on GitHub with the new tag, using the latest [`CHANGELOG.md`](/~https://github.com/apollographql/apollo-ios/blob/main/CHANGELOG.md) contents. -- [ ] Run `pod trunk push Apollo.podspec` to publish to CocoaPods. You will need write permissions for this, please contact one of the [maintainers](/~https://github.com/apollographql/apollo-ios/blob/main/README.md#maintainers) if you need access to do this. -- [ ] Announce the new version (Twitter, etc.) - -#### Things to do after release - _these need to be automated by CI_ -- [ ] Update to the new version of apollo-ios in the [sample application](/~https://github.com/apollographql/iOSTutorial). -- [ ] Update to the new version of apollo-ios in the [codegen template](/~https://github.com/apollographql/iOSCodegenTemplate). -- [ ] Make sure all [playground pages](/~https://github.com/apollographql/apollo-client-swift-playground) still execute. diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml deleted file mode 100644 index 74d2b79e22..0000000000 --- a/.github/workflows/docs-publish.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Deploy docs to production - -on: - push: - branches: - - main - - release/1.0 - paths: - - docs/** - -permissions: - contents: read - -jobs: - publish: - permissions: - contents: none - uses: apollographql/docs/.github/workflows/publish.yml@main - secrets: - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} diff --git a/Package.resolved b/Package.resolved index e99ab22147..4353c9a2ef 100644 --- a/Package.resolved +++ b/Package.resolved @@ -6,8 +6,8 @@ "repositoryURL": "/~https://github.com/stephencelis/SQLite.swift.git", "state": { "branch": null, - "revision": "0a9893ec030501a3956bee572d6b4fdd3ae158a1", - "version": "0.12.2" + "revision": "4d543d811ee644fa4cc4bfa0be996b4dd6ba0f54", + "version": "0.13.3" } } ]