Merge macOS app and Core into repository

Temporarily drop env and fastlane.

.env

@@ -1,12 +0,0 @@
-PLATFORM="ios"
-APP_NAME="Passepartout"
-PROJECT="Passepartout-iOS"
-
-GYM_SCHEME="Passepartout-iOS"
-MATCH_READONLY="true"
-BUILD_PATH="build"
-DIST_PATH="dist"
-
-# constant (fastlane)
-LC_ALL="en_US.UTF-8"
-LANG="en_US.UTF-8"

.env.beta-archive

@@ -1,2 +0,0 @@
-MATCH_TYPE="appstore"
-GYM_EXPORT_METHOD="app-store"

.env.beta-deploy

@@ -1,3 +0,0 @@
-PILOT_IPA="$DIST_PATH/$TARGET/$APP_NAME.ipa"
-PILOT_DISTRIBUTE_EXTERNAL="true"
-DEMO_ACCOUNT_REQUIRED="true"

.env.dev-archive

@@ -1,2 +0,0 @@
-MATCH_TYPE="adhoc"
-GYM_EXPORT_METHOD="ad-hoc"

.env.dev-deploy

@@ -1,3 +0,0 @@
-APPCENTER_APP_NAME=$GYM_SCHEME
-APPCENTER_DISTRIBUTE_IPA="$DIST_PATH/$TARGET/$APP_NAME.ipa"
-APPCENTER_DISTRIBUTE_DESTINATION_TYPE="group"

.env.template.secret-codesign

@@ -1,2 +0,0 @@
-MATCH_GIT_URL=
-MATCH_PASSWORD=

.env.template.secret-deploy

@@ -1,10 +0,0 @@
-APPLE_ID=
-FASTLANE_USERNAME=
-FASTLANE_PASSWORD=
-APPCENTER_OWNER_NAME=
-APPCENTER_API_TOKEN=
-APPCENTER_DISTRIBUTE_DESTINATIONS=
-PILOT_GROUPS=
-PILOT_USERNAME=
-DELIVER_USERNAME=
-PROJECT_ROOT=

.gitignore

@@ -5,12 +5,12 @@
 **/*.xcodeproj/project.xcworkspace
 **/*.xcodeproj/xcuserdata
 Pods
-fastlane/**/*.html
+**/fastlane/**/*.html
-fastlane/README.md
+**/fastlane/README.md
-fastlane/report.xml
+**/fastlane/report.xml
-fastlane/test_output
+**/fastlane/test_output
-fastlane/metadata/review_information
+**/fastlane/metadata/review_information
-fastlane/metadata/trade_representative_contact_information
+**/fastlane/metadata/trade_representative_contact_information
 build/
 dist/
 templates/

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "Submodules/API"]
 	path = Submodules/API
 	url = https://github.com/passepartoutvpn/api
-[submodule "Submodules/Core"]
-	path = Submodules/Core
-	url = https://github.com/passepartoutvpn/passepartout-core-apple
 [submodule "Submodules/fastlane-ci-templates"]
 	path = Submodules/fastlane-ci-templates
 	url = https://github.com/keeshux/fastlane-ci-templates

.travis.yml

@@ -0,0 +1,16 @@
+language: objective-c
+osx_image: xcode12
+xcode_workspace: Passepartout.xcworkspace
+xcode_scheme: PassepartoutCore-iOS
+xcode_destination: platform=iOS Simulator,OS=12.4,name=iPhone Xʀ
+cache:
+    - bundler
+    - cocoapods
+install:
+    - bundle install --jobs=3 --deployment --path=${BUNDLE_PATH:-vendor/bundle}
+    - bundle exec pod repo update
+    - travis_wait 40 bundle exec pod install
+
+branches:
+    only:
+        - master

Config.xcconfig

@@ -27,6 +27,13 @@
 // https://help.apple.com/xcode/#/dev745c5c974
 
 CFG_TEAM_ID = DTDYD63ZX9
-CFG_APP_ID = com.algoritmico.ios.Passepartout
+CFG_APP_IOS_ID = com.algoritmico.ios.Passepartout
+CFG_APP_MACOS_ID = com.algoritmico.macos.Passepartout
+CFG_APP_LAUNCHER_ID = com.algoritmico.macos.Passepartout.Launcher
 CFG_GROUP_ID = com.algoritmico.Passepartout
-CFG_APPSTORE_ID = 1433648537
+CFG_APP_VERSION = 1.14.0
+CFG_APPSTORE_IOS_ID = 1433648537
+CFG_APPSTORE_MACOS_ID = 1433645014
+CFG_COPYRIGHT = Copyright © 2021 Davide De Rosa. All rights reserved.
+
+#include? "Secret.xcconfig"

Libraries/API

@@ -1 +0,0 @@
-../Submodules/API/

Libraries/Core

@@ -1 +0,0 @@
-../Submodules/Core/

Passepartout-iOS/Scenes/About/CreditsViewController.swift

@@ -1,110 +0,0 @@
-//
-//  CreditsViewController.swift
-//  Passepartout-iOS
-//
-//  Created by Davide De Rosa on 11/26/18.
-//  Copyright (c) 2019 Davide De Rosa. All rights reserved.
-//
-//  https://github.com/passepartoutvpn
-//
-//  This file is part of Passepartout.
-//
-//  Passepartout is free software: you can redistribute it and/or modify
-//  it under the terms of the GNU General Public License as published by
-//  the Free Software Foundation, either version 3 of the License, or
-//  (at your option) any later version.
-//
-//  Passepartout is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-//  GNU General Public License for more details.
-//
-//  You should have received a copy of the GNU General Public License
-//  along with Passepartout.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-import UIKit
-import PassepartoutCore
-import Convenience
-
-//class CreditsViewController: Convenience.CreditsViewController {
-//    override func viewDidLoad() {
-//        title = L10n.Core.Credits.title
-//        licensesHeader = L10n.Core.Credits.Sections.Licenses.header
-//        noticesHeader = L10n.Core.Credits.Sections.Notices.header
-//        translationsHeader = L10n.Core.Credits.Sections.Translations.header
-//        software = AppConstants.Credits.software
-//        translators = AppConstants.Translations.translators
-//        accentColor = Theme.current.palette.accent1
-//
-//        super.viewDidLoad()
-//    }
-//}
-
-//    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
-//        guard let vc = segue.destination as? LabelViewController else {
-//            return
-//        }
-//        guard let cell = sender as? SettingTableViewCell, let indexPath = tableView.indexPath(for: cell) else {
-//            return
-//        }
-//        vc.title = cell.leftText
-//        switch model.row(at: indexPath) {
-//        case .license:
-//            vc.license = licenses[indexPath.row]
-//
-//        case .notice:
-//            vc.text = notices[indexPath.row].statement
-//
-//        default:
-//            break
-//        }
-//    }
-//}
-//
-//extension CreditsViewController {
-//    enum SectionType: Int {
-//        case licenses
-//
-//        case notices
-//
-//        case translations
-//    }
-//
-//    enum RowType: Int {
-//        case license
-//
-//        case notice
-//
-//        case translation
-//    }
-//
-//    override func numberOfSections(in tableView: UITableView) -> Int {
-//        return model.numberOfSections
-//    }
-//
-//    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
-//        return model.header(forSection: section)
-//    }
-//
-//    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-//        return model.numberOfRows(forSection: section)
-//    }
-//
-//    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-//        let cell = Cells.setting.dequeue(from: tableView, for: indexPath)
-//        switch model.row(at: indexPath) {
-//        case .license:
-//            let obj = licenses[indexPath.row]
-//            cell.leftText = obj.name
-//            cell.rightText = obj.type
-//
-//        case .notice:
-//            let obj = notices[indexPath.row]
-//            cell.leftText = obj.name
-//            cell.rightText = nil
-//
-//        }
-//        return cell
-//    }
-//}

Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout-iOS.xcscheme

@@ -29,8 +29,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "0EDE8DBE20C86910004C739C"
-               BuildableName = "Passepartout-Tunnel.appex"
+               BuildableName = "PassepartoutTunnel.appex"
-               BlueprintName = "Passepartout-iOS-Tunnel"
+               BlueprintName = "PassepartoutTunnel-iOS"
                ReferencedContainer = "container:Passepartout.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>

Passepartout.xcodeproj/xcshareddata/xcschemes/Passepartout-macOS.xcscheme

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0E5202F6259F573500CBAB56"
+               BuildableName = "Passepartout.app"
+               BlueprintName = "Passepartout-macOS"
+               ReferencedContainer = "container:Passepartout.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0E5202F6259F573500CBAB56"
+            BuildableName = "Passepartout.app"
+            BlueprintName = "Passepartout-macOS"
+            ReferencedContainer = "container:Passepartout.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0E5202F6259F573500CBAB56"
+            BuildableName = "Passepartout.app"
+            BlueprintName = "Passepartout-macOS"
+            ReferencedContainer = "container:Passepartout.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Passepartout.xcodeproj/xcshareddata/xcschemes/PassepartoutCore-iOS.xcscheme

@@ -41,7 +41,7 @@
             skipped = "NO">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "0E3152A2223F9EF500F61841"
+               BlueprintIdentifier = "0E9AA98C259F779F003FAFF1"
                BuildableName = "PassepartoutCoreTests-iOS.xctest"
                BlueprintName = "PassepartoutCoreTests-iOS"
                ReferencedContainer = "container:Passepartout.xcodeproj">

Passepartout.xcodeproj/xcshareddata/xcschemes/PassepartoutCore-macOS.xcscheme

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0E5203E9259F60D600CBAB56"
+               BuildableName = "PassepartoutCore.framework"
+               BlueprintName = "PassepartoutCore-macOS"
+               ReferencedContainer = "container:Passepartout.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "NO"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0E9AA9B9259F7821003FAFF1"
+               BuildableName = "PassepartoutCoreTests-macOS.xctest"
+               BlueprintName = "PassepartoutCoreTests-macOS"
+               ReferencedContainer = "container:Passepartout.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0E9AA9B9259F7821003FAFF1"
+               BuildableName = "PassepartoutCoreTests-macOS.xctest"
+               BlueprintName = "PassepartoutCoreTests-macOS"
+               ReferencedContainer = "container:Passepartout.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "0E5203E9259F60D600CBAB56"
+            BuildableName = "PassepartoutCore.framework"
+            BlueprintName = "PassepartoutCore-macOS"
+            ReferencedContainer = "container:Passepartout.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Passepartout.xcodeproj/xcshareddata/xcschemes/PassepartoutCoreTests-iOS.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0E9AA98C259F779F003FAFF1"
+               BuildableName = "PassepartoutCoreTests-iOS.xctest"
+               BlueprintName = "PassepartoutCoreTests-iOS"
+               ReferencedContainer = "container:Passepartout.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Passepartout.xcodeproj/xcshareddata/xcschemes/PassepartoutCoreTests-macOS.xcscheme

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1230"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "0E9AA9B9259F7821003FAFF1"
+               BuildableName = "PassepartoutCoreTests-macOS.xctest"
+               BlueprintName = "PassepartoutCoreTests-macOS"
+               ReferencedContainer = "container:Passepartout.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>