diff --git a/Gemfile.lock b/Gemfile.lock index e433651..7bbdd5a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,7 +24,7 @@ GEM faraday_middleware (0.12.2) faraday (>= 0.7.4, < 1.0) fastimage (2.1.0) - fastlane (2.68.0) + fastlane (2.68.1) CFPropertyList (>= 2.3, < 3.0.0) addressable (>= 2.3, < 3.0.0) babosa (>= 1.0.2, < 2.0.0) diff --git a/README.md b/README.md index 8c31eb4..e94a395 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,5 @@ Use your Taranis QX7S or other OpenTX bluetooth trainer as a macOS joystick foohid https://github.com/unbit/foohid https://github.com/unbit/foohid/releases/download/0.2.1/foohid-0.2.1.dmg + +npm install -g create-dmg diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 647e9e3..311932c 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -11,4 +11,11 @@ platform :mac do lane :build do gym end + + desc "Package" + lane :package do + `rm -r ../build/*` + gym + `cd ../build && create-dmg "./OpenTX BLE Joystick.app"` + end end diff --git a/fastlane/Gymfile b/fastlane/Gymfile new file mode 100644 index 0000000..5ad8b0a --- /dev/null +++ b/fastlane/Gymfile @@ -0,0 +1 @@ +output_directory "./build" diff --git a/fastlane/README.md b/fastlane/README.md index 2e2e7b2..d1f1009 100644 --- a/fastlane/README.md +++ b/fastlane/README.md @@ -35,6 +35,11 @@ xcode-select --install fastlane mac build ``` Build +### mac package +``` +fastlane mac package +``` +Package ---- diff --git a/graphics/icons.sketch b/graphics/icons.sketch index ed82e9a..210bb5e 100644 Binary files a/graphics/icons.sketch and b/graphics/icons.sketch differ diff --git a/opentx-ble-joystick.xcodeproj/project.pbxproj b/opentx-ble-joystick.xcodeproj/project.pbxproj index 26820e0..a275c93 100644 --- a/opentx-ble-joystick.xcodeproj/project.pbxproj +++ b/opentx-ble-joystick.xcodeproj/project.pbxproj @@ -347,6 +347,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 5D9WAKM8D6; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -359,6 +360,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = "io.usefulbits.opentx-ble-joystick"; PRODUCT_NAME = "OpenTX BLE Joystick"; + VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; }; @@ -369,6 +371,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; + CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = 5D9WAKM8D6; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -381,6 +384,7 @@ MACOSX_DEPLOYMENT_TARGET = 10.11; PRODUCT_BUNDLE_IDENTIFIER = "io.usefulbits.opentx-ble-joystick"; PRODUCT_NAME = "OpenTX BLE Joystick"; + VERSIONING_SYSTEM = "apple-generic"; }; name = Release; }; diff --git a/opentx-ble-joystick/Info.plist b/opentx-ble-joystick/Info.plist index f3200a2..f154dd3 100644 --- a/opentx-ble-joystick/Info.plist +++ b/opentx-ble-joystick/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 1 + 1.0 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/requirements/foohid-0.2.1.dmg b/requirements/foohid-0.2.1.dmg new file mode 100644 index 0000000..ec39f2a Binary files /dev/null and b/requirements/foohid-0.2.1.dmg differ