Merge pull request #416 from tchapgouv/phlpro/merge_nse

Move back the NSE code/config to the original Element folder
tchapgouv · Nov 18, 2021 · d632941 · d632941
2 parents 6a5ffb3 + c20173e
commit d632941
Show file tree

Hide file tree

Showing 36 changed files with 478 additions and 470 deletions.
diff --git a/BtchapNSE/Btchap-NSE-Release.xcconfig → Btchap/Config/AppIdentifiers.xcconfig b/BtchapNSE/Btchap-NSE-Release.xcconfig → Btchap/Config/AppIdentifiers.xcconfig
@@ -1,5 +1,5 @@
 // 
-// Copyright 2020 Vector Creations Ltd
+// Copyright 2021 Vector Creations Ltd
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,8 +14,15 @@
 // limitations under the License.
 //
 
-// Configuration settings file format documentation can be found at:
-// https://help.apple.com/xcode/#/dev745c5c974
+// Team
+DEVELOPMENT_TEAM = NVMQD635C6
 
-#include "Btchap-NSE-Common.xcconfig"
-#include "Pods/Target Support Files/Pods-TchapPods-BtchapNSE/Pods-TchapPods-BtchapNSE.release.xcconfig"
+// Provisioning profiles
+TCHAP_PROVISIONING_PROFILE_SPECIFIER = Btchap App Store
+TCHAP_PROVISIONING_PROFILE = b5b01403-90ca-407a-9762-9832eb6e5f79
+
+NSE_PROVISIONING_PROFILE_SPECIFIER = Btchap NSE App Store
+NSE_PROVISIONING_PROFILE = 690bd5d6-de7f-4d8a-90c8-45257dd23fe0
+
+SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = Btchap Share Extension App Store
+SHARE_EXTENSION_PROVISIONING_PROFILE = 9f253758-da9e-401d-ac42-7b0310dc58c3
diff --git a/Btchap/SupportingFiles/Btchap-App-Common.xcconfig b/Btchap/SupportingFiles/Btchap-App-Common.xcconfig
@@ -32,6 +32,3 @@ CODE_SIGN_ENTITLEMENTS = Btchap/SupportingFiles/Btchap.entitlements
 
 SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/Tchap/SupportingFiles/Tchap-Bridging-Header.h
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks
-
-CODE_SIGN_STYLE = Automatic
-DEVELOPMENT_TEAM = NVMQD635C6
diff --git a/Btchap/SupportingFiles/Btchap-App-Release.xcconfig b/Btchap/SupportingFiles/Btchap-App-Release.xcconfig
@@ -19,3 +19,6 @@
 
 #include "Btchap-App-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-TchapPods-Btchap/Pods-TchapPods-Btchap.release.xcconfig"
+
+PROVISIONING_PROFILE = $(TCHAP_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(TCHAP_PROVISIONING_PROFILE_SPECIFIER)
diff --git a/Btchap/target.yml b/Btchap/target.yml
@@ -32,14 +32,18 @@ targets:
 
     dependencies:
     - target: BtchapShareExtension
-    - target: BtchapNSE
+    - target: RiotNSE
     - target: DesignKit
 
     configFiles:
       Debug: SupportingFiles/Btchap-App-Debug.xcconfig
       Release: SupportingFiles/Btchap-App-Release.xcconfig
 
     preBuildScripts:
+    - name: 🛠 Environment
+      runOnlyWhenInstalling: false
+      shell: /bin/sh
+      script: "\"Tools/installfiles.sh\"\n"
     - name: ⚠️ SwiftLint
       runOnlyWhenInstalling: false
       shell: /bin/sh
@@ -58,6 +62,7 @@ targets:
     - path: ../Btchap/Config
     - path: ../Config/Project.xcconfig
     - path: ../Config/Project-Warnings.xcconfig
+    - path: ../Config/AppIdentifiers.xcconfig
     - path: .
       excludes:
         - "**/*.strings" # Exclude all strings files

diff --git a/BtchapNSE/Btchap-NSE-Debug.xcconfig b/BtchapNSE/Btchap-NSE-Debug.xcconfig
diff --git a/BtchapNSE/BtchapNSE.entitlements b/BtchapNSE/BtchapNSE.entitlements
diff --git a/BtchapNSE/Btchap-NSE-Common.xcconfig → BtchapNSE/Common.xcconfig b/BtchapNSE/Btchap-NSE-Common.xcconfig → BtchapNSE/Common.xcconfig
@@ -19,4 +19,13 @@
 
 #include "Btchap/SupportingFiles/Btchap-App-Common.xcconfig"
 
+PRODUCT_NAME = RiotNSE
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).nse
+
+INFOPLIST_FILE = RiotNSE/Info.plist
+
+CODE_SIGN_ENTITLEMENTS = RiotNSE/RiotNSE.entitlements
+
+SKIP_INSTALL = YES
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/RiotNSE-Bridging-Header.h
+
diff --git a/BtchapNSE/Info.plist b/BtchapNSE/Info.plist
diff --git a/BtchapNSE/target.yml b/BtchapNSE/target.yml
diff --git a/BtchapShareExtension/SupportingFiles/Btchap-ShareExtension-Common.xcconfig b/BtchapShareExtension/SupportingFiles/Btchap-ShareExtension-Common.xcconfig
@@ -19,4 +19,16 @@
 
 #include "Btchap/SupportingFiles/Btchap-App-Common.xcconfig"
 
+PRODUCT_NAME = BtchapShareExtension
 PRODUCT_BUNDLE_IDENTIFIER = $(BASE_BUNDLE_IDENTIFIER).shareExtension
+
+INFOPLIST_FILE = BtchapShareExtension/SupportingFiles/Info.plist
+ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon
+
+CODE_SIGN_ENTITLEMENTS = BtchapShareExtension/SupportingFiles/BtchapShareExtension.entitlements
+
+APPLICATION_EXTENSION_API_ONLY = YES
+SKIP_INSTALL = YES
+SWIFT_OBJC_BRIDGING_HEADER = $(SRCROOT)/$(PRODUCT_NAME)/SupportingFiles/BtchapShareExtension-Bridging-Header.h
+GCC_PREPROCESSOR_DEFINITIONS = $(inherited) IS_SHARE_EXTENSION=1
+LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks
diff --git a/BtchapShareExtension/SupportingFiles/Btchap-ShareExtension-Release.xcconfig b/BtchapShareExtension/SupportingFiles/Btchap-ShareExtension-Release.xcconfig
@@ -19,3 +19,6 @@
 
 #include "Btchap-ShareExtension-Common.xcconfig"
 #include "Pods/Target Support Files/Pods-TchapPods-BtchapShareExtension/Pods-TchapPods-BtchapShareExtension.release.xcconfig"
+
+PROVISIONING_PROFILE = $(SHARE_EXTENSION_PROVISIONING_PROFILE)
+PROVISIONING_PROFILE_SPECIFIER = $(SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER)
diff --git a/BtchapShareExtension/SupportingFiles/BtchapShareExtension-Bridging-Header.h b/BtchapShareExtension/SupportingFiles/BtchapShareExtension-Bridging-Header.h
@@ -0,0 +1,7 @@
+//
+//  Use this file to import your target's public headers that you would like to expose to Swift.
+//
+
+#import "DesignValues.h"
+#import "MXRoomSummary+Riot.h"
+#import "Tools.h"
diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig
@@ -19,10 +19,10 @@ DEVELOPMENT_TEAM = NVMQD635C6
 
 // Provisioning profiles
 TCHAP_PROVISIONING_PROFILE_SPECIFIER = Tchap App Store
-TCHAP_PROVISIONING_PROFILE = 3e2623b9-0c4b-4fde-aef8-6a67063ceb7e // to verify
+TCHAP_PROVISIONING_PROFILE = a582ec5f-a978-4fa9-934d-ee86c9033810
 
-NSE_PROVISIONING_PROFILE_SPECIFIER = "Tchap NSE: App Store"
-NSE_PROVISIONING_PROFILE = 3419a4a5-6104-45c8-a5a5-275647c1fdf6 // to verify
+NSE_PROVISIONING_PROFILE_SPECIFIER = Tchap NSE App Store
+NSE_PROVISIONING_PROFILE = 1470f574-9873-42cf-9e7e-864907334457
 
-SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Tchap Share Extension: App Store"
-SHARE_EXTENSION_PROVISIONING_PROFILE = 6b7e6b2b-5634-440e-8582-4dcce5867dd1 // to verify
+SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = Tchap Share Extension App Store
+SHARE_EXTENSION_PROVISIONING_PROFILE = b455f0f8-cf06-4b54-a0e7-8cd651840d40
diff --git a/Podfile b/Podfile
@@ -108,15 +108,7 @@ abstract_target 'TchapPods' do
     import_MatrixKit
   end
 
-  target "TchapNSE" do
-    import_MatrixKit
-  end
-
-  target "BtchapNSE" do
-    import_MatrixKit
-  end
-
-  target "SiriIntents" do
+  target "RiotNSE" do
     import_MatrixKit
   end
 end

diff --git a/Podfile.lock b/Podfile.lock
@@ -16,7 +16,7 @@ PODS:
     - AFNetworking/NSURLSession
   - BlueCryptor (1.0.32)
   - BlueECC (1.2.5)
-  - BlueRSA (1.0.34)
+  - BlueRSA (1.0.200)
   - DGCollectionViewLeftAlignFlowLayout (1.0.4)
   - Down (0.11.0)
   - DSWaveformImage (6.1.1)
@@ -39,7 +39,7 @@ PODS:
     - DTFoundation/Core
   - ffmpeg-kit-ios-audio (4.5)
   - FLEX (4.5.0)
-  - FlowCommoniOS (1.12.0)
+  - FlowCommoniOS (1.12.2)
   - GBDeviceInfo (6.6.0):
     - GBDeviceInfo/Core (= 6.6.0)
   - GBDeviceInfo/Core (6.6.0)
@@ -200,15 +200,15 @@ SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   BlueCryptor: b0aee3d9b8f367b49b30de11cda90e1735571c24
   BlueECC: 0d18e93347d3ec6d41416de21c1ffa4d4cd3c2cc
-  BlueRSA: 6f9776d62d9773502415a7db3bcbb2bbb3f71fc3
+  BlueRSA: dfeef51db96bcc4edec654956c1581adbda4e6a3
   DGCollectionViewLeftAlignFlowLayout: a0fa58797373ded039cafba8133e79373d048399
   Down: b6ba1bc985c9d2f4e15e3b293d2207766fa12612
   DSWaveformImage: 3c718a0cf99291887ee70d1d0c18d80101d3d9ce
   DTCoreText: ec749e013f2e1f76de5e7c7634642e600a7467ce
   DTFoundation: a53f8cda2489208cbc71c648be177f902ee17536
   ffmpeg-kit-ios-audio: 8c44d93054e1a9743a7014ec3dd26cd1ad8f2a59
   FLEX: e51461dd6f0bfb00643c262acdfea5d5d12c596b
-  FlowCommoniOS: e9ecbc97fb9ce5c593fb3da0e1073b65a3902026
+  FlowCommoniOS: ca92071ab526dc89905495a37844fd7e78d1a7f2
   GBDeviceInfo: ed0db16230d2fa280e1cbb39a5a7f60f6946aaec
   GZIP: 416858efbe66b41b206895ac6dfd5493200d95b3
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
@@ -237,6 +237,6 @@ SPEC CHECKSUMS:
   zxcvbn-ios: fef98b7c80f1512ff0eec47ac1fa399fc00f7e3c
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 15c26df2fc46fbdbdcba1e600ee8f47405224142
+PODFILE CHECKSUM: a7f41d7347ac156393b9c8654108ce1be8b2e62f
 
 COCOAPODS: 1.11.2