Merge pull request #1642 from Catrobat/release-0.6.19

Release 0.6.19

Makefile

@@ -2,4 +2,4 @@ help:
 	@echo usage: make init
 
 init:
-	carthage bootstrap --platform iOS --cache-builds --project-directory ./src
+	sh src/RunScripts/carthage.sh bootstrap --platform iOS --cache-builds --project-directory ./src

README.md

@@ -54,7 +54,7 @@ The Following License Header should be used for all header and source files.
 ## License Header (for source and header files)
 <pre lang="objective-c"><code>
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Cartfile

@@ -1,13 +1,5 @@
-github "ArtSabintsev/Siren"
 github "SecondRenaissance/Bohr"
-github "Marxon13/M13ProgressSuite" ~> 1.2.9
-github "TTTAttributedLabel/TTTAttributedLabel" ~> 2.0.0
-github "maxep/MXSegmentedPager" ~> 3.3.0
-github "onevcat/Kingfisher" ~> 4.0
-github "venmo/DVR"
-github "audiokit/audiokit" "v4.9.4"
+github "audiokit/audiokit" "v4.11.2"
 github "ZipArchive/ZipArchive"
-github "Quick/Quick"
-github "Quick/Nimble"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" ~> 6.34.0
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" ~> 6.34.0

src/Cartfile.resolved

@@ -1,16 +1,5 @@
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseAnalyticsBinary.json" "6.34.0"
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseCrashlyticsBinary.json" "6.34.0"
-github "ArtSabintsev/Siren" "5.2.3"
-github "Marxon13/M13ProgressSuite" "v1.2.9"
-github "Quick/Nimble" "v8.0.4"
-github "Quick/Quick" "v2.2.0"
 github "SecondRenaissance/Bohr" "3.0.0"
-github "TTTAttributedLabel/TTTAttributedLabel" "2.0.0"
-github "ZipArchive/ZipArchive" "v2.2.2"
-github "audiokit/audiokit" "v4.9.4"
-github "maxep/HMSegmentedControl" "16fad4a78c9cef2db5b1f21975a67dc55b3cc402"
-github "maxep/MXPagerView" "0.2.1"
-github "maxep/MXParallaxHeader" "0.6.1"
-github "maxep/MXSegmentedPager" "3.3.0"
-github "onevcat/Kingfisher" "4.10.1"
-github "venmo/DVR" "v2.1.0"
+github "ZipArchive/ZipArchive" "v2.2.3"
+github "audiokit/audiokit" "v4.11.2"

src/Catty.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -0,0 +1,79 @@
+{
+  "object": {
+    "pins": [
+      {
+        "package": "ActiveLabel",
+        "repositoryURL": "https://github.com/optonaut/ActiveLabel.swift",
+        "state": {
+          "branch": null,
+          "revision": "36949c1a69ef8b40574da20c9e24b115f387b1cf",
+          "version": "1.1.5"
+        }
+      },
+      {
+        "package": "CwlCatchException",
+        "repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
+        "state": {
+          "branch": null,
+          "revision": "f809deb30dc5c9d9b78c872e553261a61177721a",
+          "version": "2.0.0"
+        }
+      },
+      {
+        "package": "CwlPreconditionTesting",
+        "repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
+        "state": {
+          "branch": null,
+          "revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
+          "version": "2.0.0"
+        }
+      },
+      {
+        "package": "DVR",
+        "repositoryURL": "https://github.com/venmo/DVR",
+        "state": {
+          "branch": null,
+          "revision": "d13f7135d1993053580efe13c9ecc43200852d09",
+          "version": "2.1.0"
+        }
+      },
+      {
+        "package": "Kingfisher",
+        "repositoryURL": "https://github.com/onevcat/Kingfisher",
+        "state": {
+          "branch": null,
+          "revision": "0be276f6a7fd54af4c3eb03f2d12e12d8c8a1a1d",
+          "version": "6.0.1"
+        }
+      },
+      {
+        "package": "Nimble",
+        "repositoryURL": "https://github.com/Quick/Nimble",
+        "state": {
+          "branch": null,
+          "revision": "e491a6731307bb23783bf664d003be9b2fa59ab5",
+          "version": "9.0.0"
+        }
+      },
+      {
+        "package": "Quick",
+        "repositoryURL": "https://github.com/Quick/Quick",
+        "state": {
+          "branch": null,
+          "revision": "8cce6acd38f965f5baa3167b939f86500314022b",
+          "version": "3.1.2"
+        }
+      },
+      {
+        "package": "Siren",
+        "repositoryURL": "https://github.com/ArtSabintsev/Siren",
+        "state": {
+          "branch": null,
+          "revision": "1f6ae4635d92c5926bc51d26ab756b4c06121b9f",
+          "version": "5.5.1"
+        }
+      }
+    ]
+  },
+  "version": 1
+}

src/Catty.xcodeproj/xcshareddata/xcschemes/Catty (DEBUG).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

src/Catty.xcodeproj/xcshareddata/xcschemes/Catty (RELEASE).xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1100"
+   LastUpgradeVersion = "1230"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

src/Catty.xcodeproj/xcshareddata/xcschemes/Snapshots.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1120"
+   LastUpgradeVersion = "1230"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

src/Catty/BluetoothDevice/BluetoothDevice.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/Arduino/ArduinoDevice.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/Arduino/ArduinoHelper.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/Arduino/ArduinoProtocol.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/FirmataDevice.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/Phiro/PhiroDevice.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/Phiro/PhiroHelper.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothDevice/FirmataDevices/Phiro/PhiroProtocol.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothHelper/BluetoothHelper.xcodeproj/project.pbxproj

@@ -237,7 +237,7 @@
 		92EC98971BC3C32A0003A891 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1100;
+				LastUpgradeCheck = 1230;
 				ORGANIZATIONNAME = Catrobat;
 				TargetAttributes = {
 					92EC989F1BC3C32A0003A891 = {
@@ -360,6 +360,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -385,7 +386,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -420,6 +421,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -439,7 +441,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

src/Catty/BluetoothHelper/BluetoothHelper/BluetoothHelper.h

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/Catty/BluetoothHelper/BluetoothHelper/Components/CentralManager.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify
@@ -113,18 +113,14 @@ import UIKit
 
     // MARK: CBCentralManagerDelegate
     open func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) {
-        NSLog("peripheral: \(String(describing: peripheral.name))")
         guard let ownPeripheral = self.ownPeripherals[peripheral] else {
-            NSLog("error")
             return
         }
         ownPeripheral.didConnectPeripheral()
     }
 
     open func centralManager(_ central: CBCentralManager, didDisconnectPeripheral peripheral: CBPeripheral, error: Error?) {
-        NSLog("peripheral: \(String(describing: peripheral.name))")
         guard let ownPeripheral = self.self.ownPeripherals[peripheral] else {
-            NSLog("error")
             return
         }
         ownPeripheral.didDisconnectPeripheral()
@@ -134,15 +130,13 @@ import UIKit
         if self.ownPeripherals[peripheral] == nil {
 
             let ownPeripheral = Peripheral(cbPeripheral: peripheral, advertisements: self.unpackAdvertisements(advertisementData as [String: AnyObject]), rssi: RSSI.intValue)
-            NSLog("peripheral: \(ownPeripheral.name)")
             self.ownPeripherals[peripheral] = ownPeripheral
             self.helper.didDiscoverPeripheral(ownPeripheral)
         }
     }
 
     open func centralManager(_ central: CBCentralManager, didFailToConnect peripheral: CBPeripheral, error: Error?) {
         guard let bcPeripheral = self.ownPeripherals[peripheral] else {
-            NSLog("error")
             return
         }
         bcPeripheral.didFailToConnectPeripheral(error as NSError?)
@@ -257,7 +251,7 @@ import UIKit
 
 // MARK: Helper
 open class CentralManagerHelper<CM> where CM: CMWrapper,
-CM.PeripheralWrap: PeripheralWrapper {
+                                          CM.PeripheralWrap: PeripheralWrapper {
 
     private var afterStartingPromise = Promise<Void>()
     private var afterStoppingPromise = Promise<Void>()
@@ -278,7 +272,6 @@ CM.PeripheralWrap: PeripheralWrapper {
 
     open func startScanningForServiceUUIDs(_ central: CM, uuids: [CBUUID]!, capacity: Int? = nil) -> FutureStream<CM.PeripheralWrap> {
         if !self._isScanning {
-            NSLog("UUIDs \(String(describing: uuids))")
             if let capacity = capacity {
                 self.afterPeripheralDiscoveredPromise = StreamPromise<CM.PeripheralWrap>(capacity: capacity)
             } else {
@@ -338,25 +331,18 @@ CM.PeripheralWrap: PeripheralWrapper {
     // MARK: State
     open func didUpdateState(_ central: CM) {
         switch central.state {
-        case .unauthorized:
-            NSLog("Unauthorized")
-        case .unknown:
-            NSLog("Unknown")
-        case .unsupported:
-            NSLog("Unsupported")
-        case .resetting:
-            NSLog("Resetting")
         case .poweredOff:
-            NSLog("PoweredOff")
             if !self.afterStoppingPromise.completed {
                 self.afterStoppingPromise.success(())
             }
         case .poweredOn:
-            NSLog("PoweredOn")
             if !self.afterStartingPromise.completed {
                 self.afterStartingPromise.success(())
             }
+        default:
+            return
         }
+
     }
 
     // MARK: did discover Peripheral

src/Catty/BluetoothHelper/BluetoothHelper/Components/Characteristic.swift

@@ -1,5 +1,5 @@
 /**
- *  Copyright (C) 2010-2020 The Catrobat Team
+ *  Copyright (C) 2010-2021 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify