vector-im/element-ios/issues/5298 - Removed cocoapods-keys and moved the MapTiler key to the buildSettings.

2026-04-17 15:09:31 +02:00 · 2022-01-19 13:06:26 +02:00
parent 8084c6e0d7
commit ec1fbed87d
11 changed files with 5 additions and 33 deletions
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -11,7 +11,6 @@ on:
 env:
  # Make the git branch for a PR available to our Fastfile
  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
-  MapTilerAPIKey: ${{ secrets.MAPTILER_API_KEY }}

 jobs:
  build:
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -12,7 +12,6 @@ on:
 env:
  # Make the git branch for a PR available to our Fastfile
  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
-  MapTilerAPIKey: ${{ secrets.MAPTILER_API_KEY }}

 jobs:
  tests:
--- a/.github/workflows/release-alpha.yml
+++ b/.github/workflows/release-alpha.yml
@@ -11,7 +11,6 @@ on:
 env:
  # Make the git branch for a PR available to our Fastfile
  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
-  MapTilerAPIKey: ${{ secrets.MAPTILER_API_KEY }}

 jobs:
  build:
--- a/Config/BuildSettings.swift
+++ b/Config/BuildSettings.swift
@@ -15,7 +15,6 @@
 //

 import Foundation
-import Keys

 /// BuildSettings provides settings computed at build time.
 /// In future, it may be automatically generated from xcconfig files
@@ -370,7 +369,7 @@ final class BuildSettings: NSObject {
    
    // MARK: - Location Sharing
    
-    static let tileServerMapURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=" + RiotKeys().mapTilerAPIKey)!
+    static let tileServerMapURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
    
    static var locationSharingEnabled: Bool {
        guard #available(iOS 14, *) else {
--- a/1
+++ b/1
@@ -3,7 +3,6 @@ source "https://rubygems.org"
 gem "xcode-install"
 gem "fastlane"
 gem "cocoapods", '~>1.11.2'
-gem "cocoapods-keys"

 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,9 +3,6 @@ GEM
  specs:
    CFPropertyList (3.0.5)
      rexml
-    RubyInline (3.12.5)
-      ZenTest (~> 4.3)
-    ZenTest (4.12.0)
    activesupport (6.1.4.4)
      concurrent-ruby (~> 1.0, >= 1.0.2)
      i18n (>= 1.6, < 2)
@@ -67,9 +64,6 @@ GEM
      typhoeus (~> 1.0)
    cocoapods-deintegrate (1.0.5)
    cocoapods-downloader (1.5.1)
-    cocoapods-keys (2.2.1)
-      dotenv
-      osx_keychain
    cocoapods-plugins (1.0.0)
      nap
    cocoapods-search (1.0.1)
@@ -231,8 +225,6 @@ GEM
    netrc (0.11.0)
    optparse (0.1.1)
    os (1.1.4)
-    osx_keychain (1.0.2)
-      RubyInline (~> 3)
    plist (3.6.0)
    public_suffix (4.0.6)
    rake (13.0.6)
@@ -300,7 +292,6 @@ PLATFORMS

 DEPENDENCIES
  cocoapods (~> 1.11.2)
-  cocoapods-keys
  fastlane
  fastlane-plugin-diawi
  fastlane-plugin-versioning
@@ -308,4 +299,4 @@ DEPENDENCIES
  xcode-install

 BUNDLED WITH
-   2.2.28
+   2.2.32
--- a/5
+++ b/5
@@ -129,11 +129,6 @@ abstract_target 'RiotPods' do

 end

-plugin 'cocoapods-keys', {
-  :project => "Riot",
-  :keys => ["MapTilerAPIKey"]
-}
-
 post_install do |installer|
  installer.pods_project.targets.each do |target|

--- a/Podfile.lock
+++ b/Podfile.lock
@@ -49,7 +49,6 @@ PODS:
  - Introspect (0.1.3)
  - JitsiMeetSDK (3.10.2)
  - KeychainAccess (4.2.2)
-  - Keys (1.0.1)
  - KituraContracts (1.2.1):
    - LoggerAPI (~> 1.7)
  - KTCenterFlowLayout (1.3.1)
@@ -115,7 +114,6 @@ DEPENDENCIES:
  - HPGrowingTextView (~> 1.1)
  - Introspect (~> 0.1)
  - KeychainAccess (~> 4.2.2)
-  - Keys (from `Pods/CocoaPodsKeys`)
  - KTCenterFlowLayout (~> 1.3.1)
  - libPhoneNumber-iOS (~> 0.9.13)
  - MatrixSDK (= 0.20.16)
@@ -179,12 +177,10 @@ EXTERNAL SOURCES:
  AnalyticsEvents:
    :branch: release/swift
    :git: https://github.com/matrix-org/matrix-analytics-events.git
-  Keys:
-    :path: Pods/CocoaPodsKeys

 CHECKOUT OPTIONS:
  AnalyticsEvents:
-    :commit: f1805ad7c3fafa7fd9c6e2eaa9e0165f8142ecd2
+    :commit: 8058dc6ec07ce0acfe5fdb19eb7e309b0c13845c
    :git: https://github.com/matrix-org/matrix-analytics-events.git

 SPEC CHECKSUMS:
@@ -207,7 +203,6 @@ SPEC CHECKSUMS:
  Introspect: 2be020f30f084ada52bb4387fff83fa52c5c400e
  JitsiMeetSDK: 2f118fa770f23e518f3560fc224fae3ac7062223
  KeychainAccess: c0c4f7f38f6fc7bbe58f5702e25f7bd2f65abf51
-  Keys: a576f4c9c1c641ca913a959a9c62ed3f215a8de9
  KituraContracts: e845e60dc8627ad0a76fa55ef20a45451d8f830b
  KTCenterFlowLayout: 6e02b50ab2bd865025ae82fe266ed13b6d9eaf97
  libbase58: 7c040313537b8c44b6e2d15586af8e21f7354efd
@@ -230,6 +225,6 @@ SPEC CHECKSUMS:
  zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
  ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

-PODFILE CHECKSUM: 2493587902f8f28bb2638303dd583c47e9f24d8b
+PODFILE CHECKSUM: c9a50c445e32b40b22fadd0f54b376f1bd624ebb

 COCOAPODS: 1.11.2
--- a/Riot/Modules/Room/Location/RoomTimelineLocationView.swift
+++ b/Riot/Modules/Room/Location/RoomTimelineLocationView.swift
@@ -17,7 +17,6 @@
 import UIKit
 import Reusable
 import Mapbox
-import Keys

 class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegate {

@@ -25,7 +24,6 @@ class RoomTimelineLocationView: UIView, NibLoadable, Themable, MGLMapViewDelegat
    
    private struct Constants {
        static let mapHeight: CGFloat = 300.0
-        static let mapTilerKey = RiotKeys().mapTilerAPIKey
        static let mapZoomLevel = 15.0
        static let cellBorderRadius: CGFloat = 1.0
        static let cellCornerRadius: CGFloat = 8.0
--- a/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/LocationSharingCoordinator.swift
@@ -17,7 +17,6 @@
 import Foundation
 import UIKit
 import SwiftUI
-import Keys

 struct LocationSharingCoordinatorParameters {
    let roomDataSource: MXKRoomDataSource
--- a/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingScreenState.swift
+++ b/RiotSwiftUI/Modules/Room/LocationSharing/LocationSharingScreenState.swift
@@ -16,7 +16,6 @@

 import Foundation
 import SwiftUI
-import Keys
 import CoreLocation

@available(iOS 14.0, *)
@@ -35,7 +34,7 @@ enum MockLocationSharingScreenState: MockScreenState, CaseIterable {
            location = CLLocationCoordinate2D(latitude: 51.4932641, longitude: -0.257096)
        }
        
-        let mapURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=" + RiotKeys().mapTilerAPIKey)!
+        let mapURL = URL(string: "https://api.maptiler.com/maps/streets/style.json?key=fU3vlMsMn4Jb6dnEIFsx")!
        let viewModel = LocationSharingViewModel(tileServerMapURL: mapURL,
                                                 avatarData: AvatarInput(mxContentUri: "", matrixItemId: "", displayName: "Alice"),
                                                 location: location)