Merge branch 'develop'

ololx · ololx · commit d78328ec78e7 · 2021-06-12T10:55:01.000+05:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,83 @@
-# all hidden files
-.*
+########### Xcode ###########
+# Xcode temporary files that should never be committed
 
-#exclude
-!.gitignore
+## Build generated
+build/
+DerivedData
+
+# NB: NIB/XIB files still exist even on Storyboard projects, so we want this
+*~.nib
+*.swp
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+
+## Other
+*.xccheckout
+*.moved-aside
+*.xcuserstate
+*.xcscmblueprint
+*.xcscheme
+
+########### Mac OS X ###########
+# Mac OS X temporary files that should never be committed
+
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
+########## Objective-C/Swift specific ##########
+*.hmap
+*.ipa
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the Git repository. Instead, use fastlane to re-generate the
+
+fastlane/report.xml
+fastlane/screenshots
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Other UI elements for the SBC codec settings.
 
+## [3.1.3] - 2021-06-12
+
+### Fixed
+
+- The deployment version crashes (Mac app works fine while running in Xcode, but deployment version crashes).
+
+### Changed
+
+- The project version.
+- The swift version.
+
 ## [3.1.2] - 2021-04-02
 
 ### Changed
diff --git a/README.md b/README.md
@@ -2,11 +2,11 @@
 
 This is a simple tool for the sound quality improving of wireless headphones with the sbc codec on a mac.
 
-[![status](https://img.shields.io/badge/status-frozen-inactive?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-3.1.2-informational?style=flat-square)](BADGES_GUIDE.md@version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-maintenance-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance)  [![latest release date](https://img.shields.io/badge/latest_release_date-April_02,_2021-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-April_02,_2021-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
+[![status](https://img.shields.io/badge/status-frozen-inactive?style=flat-square)](BADGES_GUIDE.md#status) [![version](https://img.shields.io/badge/version-3.1.3-informational?style=flat-square)](BADGES_GUIDE.md@version) [![oss lifecycle](https://img.shields.io/badge/oss_lifecycle-maintenance-important?style=flat-square)](BADGES_GUIDE.md#oss-lifecycle) [![maintenance](https://img.shields.io/badge/maintenance-yes-informational?style=flat-square)](BADGES_GUIDE.md#maintenance)  [![latest release date](https://img.shields.io/badge/latest_release_date-June_12,_2021-informational?style=flat-square)](BADGES_GUIDE.md#release-date) [![last commit](https://img.shields.io/badge/last_commit-June_12,_2021-informational?style=flat-square)](BADGES_GUIDE.md#commit-date)
 
 [![license](https://img.shields.io/badge/license-MIT-informational?style=flat-square)](LICENSE) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg?style=flat-square)](code_of_conduct.md)
 
-[![platform](https://img.shields.io/badge/platform-macOS_10.14+-important?style=flat-square)](https://en.wikipedia.org/wiki/Computing_platform)
+[![platform](https://img.shields.io/badge/platform-macOS_10.11+-important?style=flat-square)](https://en.wikipedia.org/wiki/Computing_platform)
 
 ---
 
diff --git a/sbc bitpool expander.xcodeproj/project.pbxproj b/sbc bitpool expander.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -184,11 +184,13 @@
 				TargetAttributes = {
 					A34E917B2570BC73000DB3F4 = {
 						CreatedOnToolsVersion = 12.2;
+						DevelopmentTeam = C84A399767;
+						ProvisioningStyle = Automatic;
 					};
 				};
 			};
 			buildConfigurationList = A34E91772570BC73000DB3F4 /* Build configuration list for PBXProject "sbc bitpool expander" */;
-			compatibilityVersion = "Xcode 9.3";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
@@ -306,13 +308,14 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -361,12 +364,12 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.15;
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = macosx;
-				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
@@ -381,14 +384,13 @@
 				DEVELOPMENT_TEAM = C84A399767;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "sbc bitpool expander/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MARKETING_VERSION = 3.0.0;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ololx.sbc-bitpool-expander";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
+				SDKROOT = macosx10.13;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -403,14 +405,15 @@
 				DEVELOPMENT_TEAM = C84A399767;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "sbc bitpool expander/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/../Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.11;
 				MARKETING_VERSION = 3.0.0;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.ololx.sbc-bitpool-expander";
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 5.0;
+				SDKROOT = macosx10.13;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = RELEASE;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/sbc bitpool expander.xcodeproj/project.xcworkspace/xcuserdata/ololx.xcuserdatad/UserInterfaceState.xcuserstate b/sbc bitpool expander.xcodeproj/project.xcworkspace/xcuserdata/ololx.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/sbc bitpool expander/assembly/SbcAssembly.swift b/sbc bitpool expander/assembly/SbcAssembly.swift
@@ -9,7 +9,7 @@ import Foundation
 
 public class SbcAssembly: SbcAssemblyProtocol {
     
-    public static var scriptPath: String = "'./sbc bitpool expander.app/Contents/Resources/resources/sbcbpexp.sh'";
+    public static var scriptPath: String = "'\(FileManager.default.currentDirectoryPath)/sbc bitpool expander.app/Contents/Resources/resources/sbcbpexp.sh'";
     
     func configure(with viewController: SbcViewController) {
         //Create components
diff --git a/sbc bitpool expander/interactor/BluetoothAudioDefaults.swift b/sbc bitpool expander/interactor/BluetoothAudioDefaults.swift
@@ -5,7 +5,7 @@
 //  Created by Alexander A. Kropotin on 06.12.2020.
 //
 
-import Cocoa
+import Foundation
 
 public class BluetoothAudioDefaults: BluetoothAudioDefaultsProtocol {
     
@@ -19,22 +19,36 @@ public class BluetoothAudioDefaults: BluetoothAudioDefaultsProtocol {
     }
     
     public func save(_ bitpool: BitpoolDetail!) {
-        let result = SimpleAppleScriptShellBuilder.init(at: "/bin/sh", with: true)
-            .with(with: self.script)
-            .with(with: "-s")
-            .with(with: String(describing: bitpool.getMin()))
-            .with(with: String(describing: bitpool.getMax()))
-            .with(with: String(describing: bitpool.getCurr()))
+        let writeCommand = """
+        echo \\\"Set bitpool.\nThe new bitpool values are: \n min bitpool valie is \(bitpool.getMin())\n current bitpool value is \(bitpool.getCurr))\n max bitpool value is \(bitpool.getMax())\\\";
+        defaults write bluetoothaudiod \\\"Apple Initial Bitpool\\\" -int \(bitpool.getCurr());
+        defaults write bluetoothaudiod \\\"Apple Initial Min\\\" -int \(bitpool.getMin());
+        defaults write bluetoothaudiod \\\"Apple Bitpool Min\\\" -int \(bitpool.getMin());
+        defaults write bluetoothaudiod \\\"Apple Bitpool Max\\\" -int \(bitpool.getMax());
+        defaults write bluetoothaudiod \\\"Negotiated Bitpool\\\" -int \(bitpool.getCurr());
+        defaults write bluetoothaudiod \\\"Negotiated Bitpool Min\\\" -int \(bitpool.getMin());
+        defaults write bluetoothaudiod \\\"Negotiated Bitpool Max\\\" -int \(bitpool.getMax());
+        echo \\\"Reading bitpool\\\";
+        defaults read bluetoothaudiod;
+        """;
+        
+        let result = SimpleAppleScriptShellBuilder.init(with: true)
+            .with(with: writeCommand)
             .build()
             .executeAndReturnError(nil);
         
-        print(result)
+        print(result);
     }
         
     public func delete() {
-        let result = SimpleAppleScriptShellBuilder.init(at: "/bin/sh", with: true)
-            .with(with: self.script)
-            .with(with: "-d")
+        let deleteCommand = """
+        echo \\\"Delete bitpool\\\";
+        defaults delete bluetoothaudiod;
+        echo \\\"Reading bitpool\\\";
+        defaults read bluetoothaudiod;
+        """;
+        let result = SimpleAppleScriptShellBuilder.init(with: true)
+            .with(with: deleteCommand)
             .build()
             .executeAndReturnError(nil);
         
diff --git a/sbc bitpool expander/interactor/BluetoothAudioDefaultsProtocol.swift b/sbc bitpool expander/interactor/BluetoothAudioDefaultsProtocol.swift
@@ -5,7 +5,7 @@
 //  Created by Alexander A. Kropotin on 06.12.2020.
 //
 
-import Cocoa
+import Foundation
 
 public protocol BluetoothAudioDefaultsProtocol: class {
     
diff --git a/sbc bitpool expander/interactor/SimpleAppleScriptShellBuilder.swift b/sbc bitpool expander/interactor/SimpleAppleScriptShellBuilder.swift
@@ -56,7 +56,7 @@ public class SimpleAppleScriptShellBuilder: AppleScriptShellBuilder {
         }
         
         let instance = "do shell script \"\(script!)\" \(self.privileges ? "with administrator privileges" : "")";
-        print(instance);
+        NSLog(instance);
         
         return NSAppleScript.init(source: instance)!;
     }
diff --git a/sbc bitpool expander/route/AppDelegate.swift b/sbc bitpool expander/route/AppDelegate.swift
diff --git a/sbc bitpool expander/view/Base.lproj/Main.storyboard b/sbc bitpool expander/view/Base.lproj/Main.storyboard
diff --git a/sbc bitpool expander/view/SbcViewController.swift b/sbc bitpool expander/view/SbcViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public class SimpleAppleScriptShellBuilder: AppleScriptShellBuilder {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`let instance = "do shell script \"\(script!)\" \(self.privileges ? "with administrator privileges" : "")";`
`59`		`- print(instance);`
	`59`	`+ NSLog(instance);`
`60`	`60`
`61`	`61`	`return NSAppleScript.init(source: instance)!;`
`62`	`62`	`}`