diff --git a/.DS_Store b/.DS_Store index e483c735..be04e47a 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/.gitignore b/.gitignore index 9e506f0c..421ae0bb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,11 +6,6 @@ build/ DerivedData/ -dynatraceSymbols.zip -Cartfile.resolved -Gemfile.lock -dynatrace/ - ## Various settings *.pbxuser !default.pbxuser diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index fc277c52..00000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,2 +0,0 @@ -binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" "3.3.16" -binary "https://files.dynatrace.com/mobileagent/carthage/dynatrace.json" "8.217.1" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index dff0ea71..00000000 --- a/Gemfile.lock +++ /dev/null @@ -1,216 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - CFPropertyList (3.0.3) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) - artifactory (3.0.15) - atomos (0.1.3) - aws-eventstream (1.1.1) - aws-partitions (1.461.0) - aws-sdk-core (3.114.0) - aws-eventstream (~> 1, >= 1.0.2) - aws-partitions (~> 1, >= 1.239.0) - aws-sigv4 (~> 1.1) - jmespath (~> 1.0) - aws-sdk-kms (1.43.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.95.0) - aws-sdk-core (~> 3, >= 3.112.0) - aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.2.3) - aws-eventstream (~> 1, >= 1.0.2) - babosa (1.0.4) - claide (1.0.3) - colored (1.2) - colored2 (3.1.2) - commander (4.6.0) - highline (~> 2.0.0) - declarative (0.0.20) - digest-crc (0.6.3) - rake (>= 12.0.0, < 14.0.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - emoji_regex (3.2.2) - excon (0.81.0) - faraday (1.4.1) - faraday-excon (~> 1.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-cookie_jar (0.0.7) - faraday (>= 0.8.0) - http-cookie (~> 1.0.0) - faraday-excon (1.1.0) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.1.0) - faraday_middleware (1.0.0) - faraday (~> 1.0) - fastimage (2.2.3) - fastlane (2.184.0) - CFPropertyList (>= 2.3, < 4.0.0) - addressable (>= 2.3, < 3.0.0) - artifactory (~> 3.0) - aws-sdk-s3 (~> 1.0) - babosa (>= 1.0.3, < 2.0.0) - bundler (>= 1.12.0, < 3.0.0) - colored - commander (~> 4.6) - dotenv (>= 2.1.1, < 3.0.0) - emoji_regex (>= 0.1, < 4.0) - excon (>= 0.71.0, < 1.0.0) - faraday (~> 1.0) - faraday-cookie_jar (~> 0.0.6) - faraday_middleware (~> 1.0) - fastimage (>= 2.1.0, < 3.0.0) - gh_inspector (>= 1.1.2, < 2.0.0) - google-apis-androidpublisher_v3 (~> 0.1) - google-apis-playcustomapp_v1 (~> 0.1) - google-cloud-storage (~> 1.31) - highline (~> 2.0) - json (< 3.0.0) - jwt (>= 2.1.0, < 3) - mini_magick (>= 4.9.4, < 5.0.0) - multipart-post (~> 2.0.0) - naturally (~> 2.2) - plist (>= 3.1.0, < 4.0.0) - rubyzip (>= 2.0.0, < 3.0.0) - security (= 0.1.3) - simctl (~> 1.6.3) - terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) - tty-screen (>= 0.6.3, < 1.0.0) - tty-spinner (>= 0.8.0, < 1.0.0) - word_wrap (~> 1.0.0) - xcodeproj (>= 1.13.0, < 2.0.0) - xcpretty (~> 0.3.0) - xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-dynatrace (1.0.3) - fastlane-plugin-sentry (1.8.1) - gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.3.0) - google-apis-core (~> 0.1) - google-apis-core (0.3.0) - addressable (~> 2.5, >= 2.5.1) - googleauth (~> 0.14) - httpclient (>= 2.8.1, < 3.0) - mini_mime (~> 1.0) - representable (~> 3.0) - retriable (>= 2.0, < 4.0) - rexml - signet (~> 0.14) - webrick - google-apis-iamcredentials_v1 (0.3.0) - google-apis-core (~> 0.1) - google-apis-playcustomapp_v1 (0.2.0) - google-apis-core (~> 0.1) - google-apis-storage_v1 (0.3.0) - google-apis-core (~> 0.1) - google-cloud-core (1.6.0) - google-cloud-env (~> 1.0) - google-cloud-errors (~> 1.0) - google-cloud-env (1.5.0) - faraday (>= 0.17.3, < 2.0) - google-cloud-errors (1.1.0) - google-cloud-storage (1.31.1) - addressable (~> 2.5) - digest-crc (~> 0.4) - google-apis-iamcredentials_v1 (~> 0.1) - google-apis-storage_v1 (~> 0.1) - google-cloud-core (~> 1.2) - googleauth (~> 0.9) - mini_mime (~> 1.0) - googleauth (0.16.2) - faraday (>= 0.17.3, < 2.0) - jwt (>= 1.4, < 3.0) - memoist (~> 0.16) - multi_json (~> 1.11) - os (>= 0.9, < 2.0) - signet (~> 0.14) - highline (2.0.3) - http-accept (1.7.0) - http-cookie (1.0.3) - domain_name (~> 0.5) - httpclient (2.8.3) - jmespath (1.4.0) - json (2.5.1) - jwt (2.2.3) - memoist (0.16.2) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2021.0225) - mini_magick (4.11.0) - mini_mime (1.1.0) - multi_json (1.15.0) - multipart-post (2.0.0) - nanaimo (0.3.0) - naturally (2.2.1) - netrc (0.11.0) - os (1.1.1) - plist (3.6.0) - public_suffix (4.0.6) - rake (13.0.3) - representable (3.1.1) - declarative (< 0.1.0) - trailblazer-option (>= 0.1.1, < 0.2.0) - uber (< 0.2.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - retriable (3.1.2) - rexml (3.2.5) - rouge (2.0.7) - ruby2_keywords (0.0.4) - rubyzip (2.3.0) - security (0.1.3) - signet (0.15.0) - addressable (~> 2.3) - faraday (>= 0.17.3, < 2.0) - jwt (>= 1.5, < 3.0) - multi_json (~> 1.10) - simctl (1.6.8) - CFPropertyList - naturally - terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - trailblazer-option (0.1.1) - tty-cursor (0.7.1) - tty-screen (0.8.1) - tty-spinner (0.9.3) - tty-cursor (~> 0.7) - uber (0.1.0) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - webrick (1.7.0) - word_wrap (1.0.0) - xcodeproj (1.19.0) - CFPropertyList (>= 2.3.3, < 4.0) - atomos (~> 0.1.3) - claide (>= 1.0.2, < 2.0) - colored2 (~> 3.1) - nanaimo (~> 0.3.0) - xcpretty (0.3.0) - rouge (~> 2.0.7) - xcpretty-travis-formatter (1.0.1) - xcpretty (~> 0.2, >= 0.0.7) - -PLATFORMS - universal-darwin-20 - -DEPENDENCIES - fastlane - fastlane-plugin-dynatrace - fastlane-plugin-sentry - rest-client - -BUNDLED WITH - 2.2.17 diff --git a/JellyfinPlayer.xcodeproj/project.pbxproj b/JellyfinPlayer.xcodeproj/project.pbxproj index a7571608..8b581590 100644 --- a/JellyfinPlayer.xcodeproj/project.pbxproj +++ b/JellyfinPlayer.xcodeproj/project.pbxproj @@ -470,7 +470,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEVELOPMENT_ASSET_PATHS = "\"JellyfinPlayer/Preview Content\""; DEVELOPMENT_TEAM = 9R8RREG67J; ENABLE_BITCODE = NO; @@ -499,7 +499,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7; + CURRENT_PROJECT_VERSION = 8; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_ASSET_PATHS = "\"JellyfinPlayer/Preview Content\""; DEVELOPMENT_TEAM = 9R8RREG67J; diff --git a/JellyfinPlayer/Info.plist b/JellyfinPlayer/Info.plist index cc9ab1e3..a3dfe4b3 100644 --- a/JellyfinPlayer/Info.plist +++ b/JellyfinPlayer/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 7 + 8 DTXApplicationID 8c1f6941-ec78-480c-b589-b41aca29a52e DTXBeaconURL diff --git a/dynatrace/DTXDssClient b/dynatrace/DTXDssClient deleted file mode 100755 index f350c8b5..00000000 Binary files a/dynatrace/DTXDssClient and /dev/null differ diff --git a/dynatrace/version b/dynatrace/version deleted file mode 100644 index 0980f2f6..00000000 --- a/dynatrace/version +++ /dev/null @@ -1 +0,0 @@ -https://api.mobileagent.downloads.dynatrace.com/sprint-latest-dss-client/217 \ No newline at end of file diff --git a/dynatraceSymbols.zip b/dynatraceSymbols.zip deleted file mode 100644 index e94840af..00000000 Binary files a/dynatraceSymbols.zip and /dev/null differ diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 680a6950..e1387e23 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -19,23 +19,31 @@ platform :ios do desc "Push a new beta build to TestFlight" lane :beta do increment_build_number(xcodeproj: "JellyfinPlayer.xcodeproj") - gym - upload_to_testflight + gym(output_name: "JellyfinPlayer.ipa") + identifier_v = get_version_number(xcodeproj: "JellyfinPlayer.xcodeproj") + identifier_s = get_info_plist_value(path: "JellyfinPlayer/Info.plist", key: "CFBundleVersion") + dynatrace_process_symbols( + appId: "8c1f6941-ec78-480c-b589-b41aca29a52e", + os: "ios", + bundleId: "me.vigue.jellyfin", + versionStr: identifier_v, + version: identifier_s, + server: "https://ofa89490.live.dynatrace.com", + symbolsfile: "JellyfinPlayer.app.dSYM.zip" + ) upload_symbols_to_sentry( org_slug: 'aidenvigue', project_slug: 'jellyfin-swift-ios', dsym_path: "JellyfinPlayer.app.dSYM.zip" ) - identifier_v = get_version_number(xcodeproj: "JellyfinPlayer.xcodeproj") - identifier_s = get_info_plist_value(path: "JellyfinPlayer/Info.plist", key: "CFBundleVersion") - dynatrace_process_symbols( - appId: "8c1f6941-ec78-480c-b589-b41aca29a52e", - os: "ios", - bundleId: "me.vigue.jellyfin", - versionStr: identifier_v, - version: identifier_s, - server: "https://ofa89490.live.dynatrace.com", - symbolsfile: "JellyfinPlayer.app.dSYM.zip" + set_github_release( + repository_name: "acvigue/JellyfinPlayer", + name: "Release #{identifier_v}@#{identifier_s}", + tag_name: "v#{identifier_s}", + description: (File.read("Release Notes.rtf") rescue "No changelog provided"), + commitish: "main", + upload_assets: ["JellyfinPlayer.ipa"] ) + upload_to_testflight end end