Modifications after review

IDETemplateMacros.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>FILEHEADER</key>
+    <string> 
+// Copyright 2020 New Vector Ltd
+//
+// 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.
+//</string>
+</dict>
+</plist>

INSTALL.md

@@ -33,11 +33,6 @@ You can directly install XcodeGen with [Homebrew](https://brew.sh) or RubyGems:
 ```
 $ brew install xcodegen
 ```
-or
-
-```
-$ gem install xcodegen
-```
 
 ### Install bundler (optional)
 
@@ -81,7 +76,7 @@ Assuming you have already completed the **Install dependencies** instructions fr
 
 Each time you edit `$matrixKitVersion` variable in the `Podfile` you will have to run the `pod install` command.
 
-## Generate Xcode project
+## Generate Xcode workspace
 
 In order to get rid of git conflicts, the `Riot.xcodeproj` is not pushed into the git repository anymore but generated using `XcodeGen`. To generate the `xcodeproj` file simply run the following command line in the `Riot` folder:
 

Podfile

@@ -11,9 +11,9 @@ use_frameworks!
 # - `{ {kit spec hash} => {sdk spec hash}` to depend on specific pod options (:git => …, :podspec => …) for each repo. Used by Fastfile during CI
 #
 # Warning: our internal tooling depends on the name of this variable name, so be sure not to change it
-$matrixKitVersion = '= 0.13.4'
+# $matrixKitVersion = '= 0.13.4'
 # $matrixKitVersion = :local
-# $matrixKitVersion = {'develop' => 'develop'}
+$matrixKitVersion = {'develop' => 'develop'}
 
 ########################################
 

Podfile.lock

@@ -127,10 +127,10 @@ DEPENDENCIES:
   - KeychainAccess (~> 4.2.1)
   - KTCenterFlowLayout (~> 1.3.1)
   - MatomoTracker (~> 7.2.2)
-  - MatrixKit (= 0.13.4)
-  - MatrixKit/AppExtension (= 0.13.4)
-  - MatrixSDK
-  - MatrixSDK/JingleCallStack
+  - MatrixKit (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
+  - MatrixKit/AppExtension (from `https://github.com/matrix-org/matrix-ios-kit.git`, branch `develop`)
+  - MatrixSDK (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
+  - MatrixSDK/JingleCallStack (from `https://github.com/matrix-org/matrix-ios-sdk.git`, branch `develop`)
   - OLMKit
   - ReadMoreTextView (~> 3.0.1)
   - Reusable (~> 4.1)
@@ -164,8 +164,6 @@ SPEC REPOS:
     - LoggerAPI
     - Logging
     - MatomoTracker
-    - MatrixKit
-    - MatrixSDK
     - OLMKit
     - ReadMoreTextView
     - Realm
@@ -177,6 +175,22 @@ SPEC REPOS:
     - zxcvbn-ios
     - ZXingObjC
 
+EXTERNAL SOURCES:
+  MatrixKit:
+    :branch: develop
+    :git: https://github.com/matrix-org/matrix-ios-kit.git
+  MatrixSDK:
+    :branch: develop
+    :git: https://github.com/matrix-org/matrix-ios-sdk.git
+
+CHECKOUT OPTIONS:
+  MatrixKit:
+    :commit: 9344a98d28277c4bd3e932aebf99b0cff7d15917
+    :git: https://github.com/matrix-org/matrix-ios-kit.git
+  MatrixSDK:
+    :commit: 29d1255d97c719880106a1639a390180fa5dd205
+    :git: https://github.com/matrix-org/matrix-ios-sdk.git
+
 SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
@@ -212,6 +226,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 198d9f0614bcf132a6aa31bdf8c1beb0360fdea7
+PODFILE CHECKSUM: 39eb6c37f8951d721a1e4be5eb71e192b965c4f0
 
 COCOAPODS: 1.10.0

Targets/Application.yml

@@ -79,8 +79,6 @@ targets:
         - "Modules/Room/EmojiPicker/Data/EmojiMart/EmojiJSONStore.swift"
         - "Modules/KeyBackup/Recover/Loading"
         - "Modules/KeyBackup/Setup/RecoveryKey"
-        - "**/*.strings" # Exclude all strings files
-    - path: ../Riot/Assets/en.lproj/Vector.strings # except Vector.strings
     - path: ../Riot/SupportingFiles/App-Common.xcconfig
       buildPhase: resources
     type: application

Targets/NotificationServiceExtension.yml

@@ -48,6 +48,7 @@ targets:
     - path: ../Riot/Managers/LocalAuthentication/LocalAuthenticationService.swift
     - path: ../Config/Configurable.swift
     - path: ../Riot/Utils/Constants.swift
+    - path: ../Riot/Utils/Memory.swift
     - path: ../RiotNSE/NSE-Common.xcconfig
       buildPhase: resources
     settings:

createWorkspace.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
-
+cp IDETemplateMacros.plist Riot.xcodeproj/xcshareddata/
 if [ $(gem list bundler -i) ]; then
 	bundle install
 	bundle exec pod install
 else
 	pod install
-fi
+fi

project.yml

@@ -23,7 +23,11 @@ settingGroups:
     SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER: "Vector Share Extension: App Store"
     SIRI_INTENTS_PROVISIONING_PROFILE: 18a66f93-ffe1-4008-b343-58350cc65023
     SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER: "Vector Siri Intents: App Store"
-
+fileGroups:
+    - README.md
+    - CHANGES.rst
+    - AUTHORS.rst
+    - Podfile
 settings:
   base:
     IPHONEOS_DEPLOYMENT_TARGET: 11.0
@@ -92,8 +96,8 @@ options:
   createIntermediateGroups: true
   postGenCommand: sh createWorkspace.sh
 include:
-  - path: Targets/Riot.yml
-  - path: Targets/RiotTests.yml
-  - path: Targets/RiotShareExtension.yml
+  - path: Targets/Application.yml
+  - path: Targets/ApplicationTests.yml
+  - path: Targets/ShareExtension.yml
   - path: Targets/SiriIntents.yml
-  - path: Targets/RiotNSE.yml
+  - path: Targets/NotificationServiceExtension.yml