-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into sam/additional-autofill-pixels
# By Dominik Kapusta (4) and others # Via GitHub * develop: Blockable JS Alerts inside tabs (#904) Fix add bookmark / folder modal in fullscreen (#930) Add Mac App Store target (#927) Pull request review checklist added to the pull request template (#935) Version Bump to 0.31.7 Update embedded files Update BSK with autofill 6.1.2 (#942) Migrate to targeted Swift Concurrency checking (#937) Add bundler configuration to limit Gemfile.lock noise (#939) update openssl depedency (#918) Remove tab content when showing TabContent.none (such as for new tabs opened from navigation links) (#938) Update GRDB to 2.0.0 (upstream 6.6.0, SQLCipher 4.5.3) (#933) Sparkle 2 (#934) Bump Submodules/privacy-reference-tests from `de75d51` to `4fdbbb6` (#932) # Conflicts: # DuckDuckGo.xcodeproj/project.pbxproj
- Loading branch information
Showing
119 changed files
with
18,874 additions
and
14,897 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| --- | ||
| BUNDLE_PATH: "vendor/bundle" | ||
| BUNDLE_FORCE_RUBY_PLATFORM: "ruby" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| name: Make App Store Connect Release | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| destination: | ||
| description: "Upload destination (TestFlight or App Store)" | ||
| required: true | ||
| default: appstore | ||
| type: choice | ||
| options: | ||
| - testflight | ||
| - appstore | ||
|
|
||
| jobs: | ||
| make-release: | ||
|
|
||
| name: Make App Store Connect Release | ||
|
|
||
| runs-on: macos-12 | ||
|
|
||
| steps: | ||
|
|
||
| - name: Assert release branch | ||
| if: github.event.inputs.destination == 'appstore' | ||
| run: | | ||
| case "${{ github.ref }}" in | ||
| refs/heads/release/*) ;; | ||
| refs/heads/hotfix/*) ;; | ||
| *) echo "👎 Not a release or hotfix branch"; exit 1 ;; | ||
| esac | ||
| - name: Register SSH keys for submodules access | ||
| uses: webfactory/ssh-agent@v0.7.0 | ||
| with: | ||
| ssh-private-key: | | ||
| ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }} | ||
| ${{ secrets.SSH_PRIVATE_KEY_FIND_IN_PAGE }} | ||
| ${{ secrets.SSH_PRIVATE_KEY_PRIVACY_DASHBOARD }} | ||
| - name: Check out the code | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - name: Select Xcode | ||
| run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer | ||
|
|
||
| - name: Prepare fastlane | ||
| run: bundle install | ||
|
|
||
| - name: Install xcbeautify | ||
| run: brew install xcbeautify | ||
|
|
||
| - name: Archive and Upload the App | ||
| env: | ||
| APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} | ||
| APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} | ||
| APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} | ||
| MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} | ||
| run: bundle exec fastlane release_${{ github.event.inputs.destination }} | ||
|
|
||
| - name: Send Mattermost message | ||
| env: | ||
| WORKFLOW_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} | ||
| DESTINATION: ${{ github.event.inputs.destination }} | ||
| run: | | ||
| export MM_USER_HANDLE=$(base64 -d <<< ${{ secrets.MM_HANDLES_BASE64 }} | jq ".${{ github.actor }}" | tr -d '"') | ||
| if [[ -z "${MM_USER_HANDLE}" ]]; then | ||
| echo "Mattermost user handle not known for ${{ github.actor }}, skipping sending message" | ||
| else | ||
| curl -s -H 'Content-type: application/json' \ | ||
| -d "$(envsubst < ./scripts/assets/appstore-release-mm-template.json)" \ | ||
| ${{ secrets.MM_WEBHOOK_URL }} | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -64,3 +64,4 @@ excluded: | |
| - Unit Tests | ||
| - Integration Tests | ||
| - UI Tests | ||
| - vendor | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| // Copyright © 2022 DuckDuckGo. 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. | ||
| // | ||
|
|
||
| #include "AppTargetsBase.xcconfig" | ||
| #include "../AppStore.xcconfig" | ||
| #include "ManualAppStoreRelease.xcconfig" | ||
|
|
||
| BUNDLE_IDENTIFIER_PREFIX = com.duckduckgo.mobile.ios | ||
|
|
||
| CODE_SIGN_ENTITLEMENTS = DuckDuckGo/DuckDuckGoAppStore.entitlements | ||
| CODE_SIGN_ENTITLEMENTS[config=CI][arch=*][sdk=*] = DuckDuckGo/DuckDuckGoAppStoreCI.entitlements | ||
|
|
||
| CODE_SIGN_IDENTITY[sdk=macosx*] = 3rd Party Mac Developer Application | ||
| CODE_SIGN_IDENTITY[config=Review][sdk=macosx*] = Developer ID Application | ||
| CODE_SIGN_IDENTITY[config=Debug][sdk=macosx*] = Apple Development | ||
| CODE_SIGN_IDENTITY[config=CI][sdk=macosx*] = | ||
|
|
||
| ENABLE_APP_SANDBOX = YES | ||
|
|
||
| MACOSX_DEPLOYMENT_TARGET = 12.3 | ||
|
|
||
| PRODUCT_MODULE_NAME = DuckDuckGo_Privacy_Browser | ||
| PRODUCT_NAME_PREFIX = DuckDuckGo App Store | ||
| PRODUCT_NAME[config=Release][arch=*][sdk=*] = $(RELEASE_PRODUCT_NAME_OVERRIDE:default=$(PRODUCT_NAME_PREFIX)) | ||
|
|
||
| PROVISIONING_PROFILE_SPECIFIER[config=Debug][sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=CI][sdk=macosx*] = | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Release][sdk=macosx*] = match AppStore com.duckduckgo.mobile.ios macos | ||
| PROVISIONING_PROFILE_SPECIFIER[config=Review][sdk=macosx*] = Sandbox MacOS Browser Product Review | ||
|
|
||
| #include? "../../LocalOverridesAppStore.xcconfig" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| // | ||
| // ManualAppStoreRelease.xcconfig | ||
| // | ||
| // Copyright © 2023 DuckDuckGo. 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. | ||
| // | ||
|
|
||
| // App Store app target's PRODUCT_NAME is "DuckDuckGo App Store" | ||
| // ("DuckDuckGo App Store Review" for Product Review build). | ||
| // It's required to keep it different from non-App Store target | ||
| // because otherwise Xcode gets confused: it would make unit tests | ||
| // targets depend on both app targets and require both to be built | ||
| // before unit tests are compiled, and would immediately fail due | ||
| // to the same output files being generated by 2 targets. | ||
| // | ||
| // For Release build we still need to keep "DuckDuckGo" name. This | ||
| // is handled automatically by archive.sh, fastlane and GitHub Actions, | ||
| // but in rare cases when the release has to be done manually from | ||
| // Xcode, this additional setting is required. | ||
| // | ||
| // Uncomment the line below when making App Store Release manually from Xcode: | ||
| //RELEASE_PRODUCT_NAME_OVERRIDE = DuckDuckGo |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
|
|
||
| // Copyright © 2022 DuckDuckGo. 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. | ||
| // | ||
|
|
||
| #include "AppStoreBuildNumber.xcconfig" | ||
|
|
||
| GCC_PREPROCESSOR_DEFINITIONS[arch=*][sdk=*] = APPSTORE=1 | ||
| GCC_PREPROCESSOR_DEFINITIONS[config=CI][arch=*][sdk=*] = APPSTORE=1 DEBUG=1 CI=1 $(inherited) | ||
| GCC_PREPROCESSOR_DEFINITIONS[config=Debug][arch=*][sdk=*] = APPSTORE=1 DEBUG=1 $(inherited) | ||
| GCC_PREPROCESSOR_DEFINITIONS[config=Review][arch=*][sdk=*] = APPSTORE=1 REVIEW=1 $(inherited) | ||
|
|
||
| MACOSX_DEPLOYMENT_TARGET = 12.3 | ||
|
|
||
| SWIFT_ACTIVE_COMPILATION_CONDITIONS[arch=*][sdk=*] = APPSTORE $(FEATURE_FLAGS) | ||
| SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=CI][arch=*][sdk=*] = APPSTORE DEBUG CI $(FEATURE_FLAGS) | ||
| SWIFT_ACTIVE_COMPILATION_CONDITIONS[config=Debug][arch=*][sdk=*] = APPSTORE DEBUG $(FEATURE_FLAGS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| CURRENT_PROJECT_VERSION = 4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // Copyright © 2022 DuckDuckGo. 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. | ||
| // | ||
|
|
||
| #include "IntegrationTests.xcconfig" | ||
| #include "../AppStore.xcconfig" | ||
|
|
||
| PRODUCT_BUNDLE_IDENTIFIER = com.duckduckgo.mobile.ios.Integration-Tests | ||
|
|
||
| TEST_HOST=$(BUILT_PRODUCTS_DIR)/DuckDuckGo App Store.app/Contents/MacOS/DuckDuckGo App Store |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.