Pull new version

.depsvalidator.yml

@@ -2,25 +2,58 @@
 manifests:
   - type: Package.swift
   - type: Package.resolved
+    omit_for:
+      # Temporarily disabled since we use .binaryTarget instead of SPM dependency for MapboxCoreMaps
+      - MapboxCoreMaps
+      - MapboxCommon
   - type: Package.resolved
-    path: Apps/Apps.xcworkspace/xcshareddata/swiftpm/Package.resolved
+    path: Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+    omit_for:
+    # Temporarily disabled since we use .binaryTarget instead of SPM dependency for MapboxCoreMaps
+      - MapboxCoreMaps
+      - MapboxCommon
   - type: Podspec
   - type: packager
+  - type: Cross-check Common SDK version with GL Native
+    omit_for:
+      - MapboxCoreMaps
+      - MapboxCommon
+      - Turf
 dependencies:
   - name: MapboxCoreMaps
     variations:
       Package.swift: mapbox-core-maps-ios
+      Package.resolved: mapbox-core-maps-ios
   - name: MapboxCommon
     variations:
       Package.swift: mapbox-common-ios
+      Package.resolved: mapbox-common-ios
   - name: Turf
     variations:
       Package.swift: turf-swift
-  - name: MapboxMobileEvents
-    variations:
-      Package.swift: mapbox-events-ios
+      Package.resolved: turf-swift
 manifest_definitions:
   - name: packager
     type: SemanticVersion
     default_path: scripts/release/packager/versions.json
     command: jq -r ".$DEPSVALIDATOR_DEPENDENCY_NAME" "$DEPSVALIDATOR_MANIFEST_PATH"
+  - name: Cross-check Common SDK version with GL Native
+    type: SemanticVersion
+    default_path: gl-native-common-version(virtual_manifest)
+    command: |
+      set -e
+      export GITHUB_TOKEN=$(mbx-ci github reader token)
+      if [[ -z "$GITHUB_TOKEN" ]];
+      then
+        exit 1
+      fi
+      COREMAPS_VERSION=$(jq -r .MapboxCoreMaps scripts/release/packager/versions.json)
+      if [[ "$COREMAPS_VERSION" == *"SNAPSHOT"* ]];
+      then
+        # take commit hash from a snapshot string, e.g. 11.0.0-SNAPSHOT.1012T1154Z.cad0c70
+        GL_NATIVE_GITHUB_REF=$(echo "$COREMAPS_VERSION" | cut -d "." -f 5)
+      else
+        GL_NATIVE_GITHUB_REF="maps-v$COREMAPS_VERSION"
+      fi
+
+      gh api -H "Accept: application/vnd.github+json" "/repos/mapbox/mapbox-gl-native-internal/contents/common-version.txt?ref=$GL_NATIVE_GITHUB_REF" --jq ".content" | base64 --decode

.fastlane/Fastfile

@@ -17,26 +17,57 @@ ENV["SPACESHIP_SKIP_2FA_UPGRADE"] = "1"
 
 platform :ios do
 
+  lane :setup_distribution_cert do
+    setup_ci
+    match(type: "appstore")
+  end
+
+  private_lane :api_key_if_needed do
+    # We recommend to have api key on local machines to improve sign-in experience
+    # While on the CI we will use api key components for the authentication
+    # You can setup the api key by following the guide: https://github.com/mapbox/apple-internal/blob/master/guides/Modern%20authentification.md
+    file_path = ENV['APP_STORE_CONNECT_API_KEY_PATH']
+
+    if file_path.nil? || !File.exist?(file_path)
+      app_store_connect_api_key
+    end
+  end
+
   lane :build_examples_tests do
+    api_key_if_needed
     setup_circle_ci
     sync_code_signing
     update_code_signing_settings(
       use_automatic_signing: false,
-      path: "Apps/Examples/Examples.xcodeproj",
+      path: "Examples.xcodeproj",
+      team_id: "GJZR2MEM28", # Developer Portal Team ID,
+      profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["mapbox.ExamplesUITests.xctrunner"],
+      targets: ["ExamplesUITests"],
+      code_sign_identity: "Apple Development: Created via API",
+    )
+    update_code_signing_settings(
+      use_automatic_signing: false,
+      path: "Examples.xcodeproj",
       team_id: "GJZR2MEM28", # Developer Portal Team ID,
       profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.examples"],
       targets: ["Examples"],
-      code_sign_identity: "Apple Development: Machiney McMachineface",
+      code_sign_identity: "Apple Development: Created via API",
     )
     run_tests(
-      workspace: 'Apps/Apps.xcworkspace',
+      project: 'Examples.xcodeproj',
       scheme: 'Examples',                  # XCTest scheme
       clean: true,                        # Recommended: This would ensure the build would not include unnecessary files
-      configuration: "Release",
-      xcargs: "ENABLE_TESTABILITY=YES SWIFT_TREAT_WARNINGS_AS_ERRORS=NO",
+      # Use the Debug mode here to avoid the compiler crash
+      # https://github.com/apple/swift/issues/72117#issuecomment-1999619388
+      # using the SWIFT_COMPILATION_MODE=incremental doesn't for this scheme.
+      # configuration: "Release",
+      configuration: "Debug",
+      testplan: "Examples no unit tests",
+      xcargs: "ENABLE_TESTABILITY=YES SWIFT_TREAT_WARNINGS_AS_ERRORS=NO COMPILER_INDEX_STORE_ENABLE=NO",
       skip_detect_devices: true,          # Required
       build_for_testing: true,            # Required
       sdk: 'iphoneos',                    # Required
+      destination: "generic/platform=iOS", # Required
       should_zip_build_products: true,     # Must be true to set the correct format for Firebase Test Lab,
       result_bundle: true,
       output_directory: "output/",
@@ -65,10 +96,10 @@ platform :ios do
   end
 
   lane :beta do
-    app_store_connect_api_key # Generate API Token
+    api_key_if_needed # Generate API Token
     increment_build_number(
       build_number: latest_testflight_build_number + 1,
-      xcodeproj: 'Apps/Examples/Examples.xcodeproj'
+      xcodeproj: 'Examples.xcodeproj'
     )
     build_and_submit
   end
@@ -80,16 +111,18 @@ platform :ios do
     sync_code_signing(type: "development")
     update_code_signing_settings(
       use_automatic_signing: false,
-      path: "Apps/Examples/Examples.xcodeproj",
+      path: "Examples.xcodeproj",
       team_id: "GJZR2MEM28", # Developer Portal Team ID,
       profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.examples"],
-      targets: ["Examples"]
+      targets: ["Examples"],
+      code_sign_identity: "Apple Development: Created via API",
+      entitlements_file_path: "Sources/Examples/Examples_CarPlay.entitlements"
     )
     sync_code_signing(type: "appstore")
     build_app(
       scheme: "Examples",
-      workspace: "Apps/Apps.xcworkspace",
-      xcargs: "SWIFT_TREAT_WARNINGS_AS_ERRORS=NO" # Disable to bypass Deprecated error on OfflineManager example
+      project: "Examples.xcodeproj",
+      xcargs: "SWIFT_TREAT_WARNINGS_AS_ERRORS=NO COMPILER_INDEX_STORE_ENABLE=NO" # Disable to bypass Deprecated error on OfflineManager example
     )
     upload_to_testflight(
       beta_app_feedback_email: "[email protected]",
@@ -101,7 +134,7 @@ platform :ios do
 
   lane :build_tests do
     sh("cd .. && xcodegen")
-    app_store_connect_api_key # Generate API Token
+    api_key_if_needed # Generate API Token
     setup_circle_ci
     sync_code_signing(app_identifier: "com.mapbox.MapboxMapsTestHost")
     update_code_signing_settings(
@@ -110,14 +143,16 @@ platform :ios do
       team_id: "GJZR2MEM28", # Developer Portal Team ID,
       profile_name: lane_context[SharedValues::MATCH_PROVISIONING_PROFILE_MAPPING]["com.mapbox.MapboxMapsTestHost"],
       targets: ["MapboxTestHost"],
-      code_sign_identity: "Apple Development: Machiney McMachineface",
+      code_sign_identity: "Apple Development: Created via API",
     )
     run_tests(
       project: 'MapboxMaps.xcodeproj',
       scheme: 'MapboxTestHost',
       clean: true,
       configuration: "Release",
-      xcargs: "ENABLE_TESTABILITY=YES",
+      # Use here SWIFT_COMPILATION_MODE=incremental to avoid the compiler crash
+      # https://github.com/apple/swift/issues/72117#issuecomment-1999619388
+      xcargs: "ENABLE_TESTABILITY=YES COMPILER_INDEX_STORE_ENABLE=NO SWIFT_COMPILATION_MODE=incremental",
       build_for_testing: true,
       destination: 'generic/platform=iOS',
       should_zip_build_products: true,

.fastlane/Matchfile

@@ -1,3 +1,4 @@
 git_url("[email protected]:mapbox/apple-certificates.git")
 type("development") # The default type, can be: appstore, adhoc, enterprise or development
-app_identifier(["com.mapbox.examples"])
+app_identifier(["com.mapbox.examples", "mapbox.ExamplesUITests.xctrunner"])
+template_name("CarPlay Navigation App (Distribution)")

.gitattributes

@@ -3,4 +3,5 @@
 CHANGELOG.md merge=union
 
 # Mark files as generated in Github PRs
-Sources/MapboxMaps/Style/Generated/** linguist-generated=true
+**/Generated/** linguist-generated=true
+LICENSE.md linguist-generated=true

.github/CODEOWNERS

@@ -1 +1 @@
-* @mapbox/maps-ios
+* @mapbox/maps-ios

.github/ISSUE_TEMPLATE/bug.md

@@ -1,5 +1,5 @@
 ---
-name: Bug 
+name: Bug
 about: This template should be used for reporting bugs and defects.
 labels: 'bug :beetle:'
 assignees: ''

.github/ISSUE_TEMPLATE/feature.md

@@ -13,4 +13,3 @@ assignees: ''
 
 ## Why
 <- 1-2 sentence description of why you're requesting this feature. What problem does it solve? Why is it valuable? ->
-

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,10 +16,21 @@ Describe the changes in this PR here.
 -->
 
 ## Pull request checklist:
- - [ ] Write tests for all new functionality. If tests were not written, please explain why.
- - [ ] Add documentation comments for any added or updated public APIs.
- - [ ] Add any new public, top-level symbols to the Jazzy config's `custom_categories` (scripts/doc-generation/.jazzy.yaml)
  - [ ] Describe the changes in this PR, especially public API changes.
+ - [ ] Include before/after visuals or gifs if this PR includes visual changes.
+    <!--
+        | Before | After |
+        | ----- | ----- |
+        | <img src="" width = 250/> | <img src="" width = 250/> |
+        or
+        | <video src="" width = 250/> | <video src="" width = 250/> |
+    -->
+ - [ ] Write tests for all new functionality. Put tests in correct [Test Plan](https://github.com/mapbox/mapbox-maps-ios/tree/main/Tests/TestPlans) (Unit, Integration, All)
+   - [ ] If tests were not written, please explain why.
+ - [ ] Add documentation comments for any added or updated public APIs.
+ - [ ] Add any new public, top-level symbols to the DocC custom catatlog (Sources/MapboxMaps/Documentation.docc/API Catalogs)
  - [ ] Add a changelog entry to to bottom of the relevant section (typically the `## main` heading near the top).
  - [ ] Update the guides (internal access only), README.md, and DEVELOPING.md if their contents are impacted by these changes.
- - [ ] Review and agree to the Contributor License Agreement ([CLA](https://github.com/mapbox/mapbox-maps-ios/blob/main/CONTRIBUTING.md#contributor-license-agreement)).
+ - [ ] If this PR is a `v10.[version]` release branch fix / enhancement, merge it to `main` first and then port to `v10.[version]` release branch.
+
+PRs must be submitted under the terms of our Contributor License Agreement [CLA](https://github.com/mapbox/mapbox-maps-ios/blob/main/CONTRIBUTING.md#contributor-license-agreement).

.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"

.github/stale.yml

@@ -13,7 +13,7 @@ exemptLabels:
 
 pulls:
   daysUntilStale: 60
-  daysUntilClose: -1
+  daysUntilClose: 7
   markComment: false
   closeComment: >
     This pull request has been automatically detected as stale because it has not had

.github/workflows/analyze.yml

@@ -0,0 +1,85 @@
+on:
+    workflow_call:
+      inputs:
+        project-path:
+          required: true
+          type: string
+        scheme:
+          type: string
+          default: MapboxMaps
+        destination:
+          type: string
+          default: generic/platform=iOS Simulator
+        executor:
+          type: string
+          default: '["ubuntu-latest"]'
+      secrets:
+        SDK_REGISTRY_TOKEN:
+          required: true
+
+concurrency:
+  group: ci-${{ github.workflow }}-${{ github.ref || github.run_id }}
+  cancel-in-progress: true
+
+jobs:
+    analyze:
+      name: Analyze
+      runs-on: ${{ matrix.executor }}
+      permissions:
+        actions: read
+        contents: read
+        security-events: write
+
+      strategy:
+        fail-fast: false
+        matrix:
+          language: ["javascript", "python", "ruby"]
+          executor: ${{ fromJson(inputs.executor) }}
+          include:
+            - language: "swift"
+              executor: "macos-13"
+          # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+      steps:
+        - name: Checkout repository
+          uses: actions/checkout@v4
+
+        - name: Allow cloning public repositories from github.com via SSH
+          run: |
+            git config --global url.https://github.com/.insteadOf [email protected]:
+
+        - name: Inject tokens
+          if: matrix.language == 'swift'
+          run: |
+            echo "machine api.mapbox.com login mapbox password ${{ secrets.SDK_REGISTRY_TOKEN }}" >> ~/.netrc
+            chmod 0600 ~/.netrc
+
+            echo "test_token" > ~/.mapbox
+
+        # Initializes the CodeQL tools for scanning.
+        - name: Initialize CodeQL
+          uses: github/codeql-action/init@v3
+          with:
+            languages: ${{ matrix.language }}
+            # If you wish to specify custom queries, you can do so here or in a config file.
+            # By default, queries listed here will override any specified in a config file.
+            # Prefix the list here with "+" to use these queries and those in the config file.
+
+            # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+            # queries: security-extended,security-and-quality
+
+        - name: Build Examples
+          if: matrix.language == 'swift'
+          run: set -o pipefail && xcodebuild build -project '${{ inputs.project-path }}' -scheme ${{ inputs.scheme }} -destination '${{ inputs.destination }}'| tee xcodebuild.log | xcpretty
+
+        - name: Archive xcodebuild.log
+          uses: actions/upload-artifact@v4
+          if: matrix.language == 'swift'
+          with:
+            name: xcodebuild.log
+            path: xcodebuild.log
+
+        - name: Perform CodeQL Analysis
+          uses: github/codeql-action/analyze@v3
+          with:
+            category: "/language:${{matrix.language}}"

.github/workflows/codeql.yml

@@ -0,0 +1,16 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: ['main', 'publisher-production', 'release/*', 'lts/*']
+  pull_request:
+    branches: ['main', 'publisher-production', 'release/*', 'lts/*']
+  schedule:
+    - cron: "16 20 * * 4"
+
+jobs:
+  analyze:
+    uses: ./.github/workflows/analyze.yml
+    with:
+      project-path: Examples.xcodeproj
+    secrets: inherit

.gitignore

@@ -6,11 +6,13 @@ xcuserdata
 node_modules
 developer.xcconfig
 Carthage
-api-docs
+Cartfile*
 MapboxAccessToken
 scripts/release/packager/artifacts
 scripts/release/packager/build
 scripts/xcparty/.swiftpm
 MapboxMaps.xcodeproj
+*.doccarchive
+Sources/MapboxMaps/Documentation.docc/*.html
 
-.vscode
+.vscode

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "jazzy-theme"]
-	path = scripts/doc-generation/jazzy-theme
-	url = https://github.com/mapbox/jazzy-theme.git