From f9334c51a3e67b55aade9d644b89628c89f4fd7b Mon Sep 17 00:00:00 2001 From: Lei Nelissen Date: Sat, 15 Jan 2022 17:51:15 +0100 Subject: [PATCH] Release new versions --- android/app/build.gradle | 4 ++-- android/gradle.properties | 2 +- fastlane/Fastfile | 19 +++++++++++++------ fastlane/Pluginfile | 1 + .../project.pbxproj | 4 ++-- ios/JellyfinAudioPlayer/Info.plist | 4 ++-- ios/JellyfinAudioPlayerTests/Info.plist | 4 ++-- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 55a93c9..6373d9c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -136,8 +136,8 @@ android { applicationId "com.jellyfinaudioplayer" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 1 - versionName "1.0" + versionCode 4 + versionName "0.2.3" multiDexEnabled true } splits { diff --git a/android/gradle.properties b/android/gradle.properties index cdb4c21..710498b 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -10,7 +10,7 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx10248m -XX:MaxPermSize=256m -# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 0111520..6b10e44 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -16,9 +16,12 @@ platform :ios do use_automatic_signing: true, path: "ios/JellyfinAudioPlayer.xcodeproj" ) - increment_version_number(version_number: package["version"]); + increment_version_number( + version_number: package["version"], + xcodeproj: "ios/JellyfinAudioPlayer.xcodeproj", + ); increment_build_number( - xcodeproj: "ios/JellyfinAudioPlayer.xcodeproj" + xcodeproj: "ios/JellyfinAudioPlayer.xcodeproj", ) build_app( scheme: "Jellyfin Player", @@ -28,7 +31,7 @@ platform :ios do ) upload_to_testflight build_number = get_build_number( - xcodeproj: "ios/JellyfinAudioPlayer.xcodeproj" + xcodeproj: "ios/JellyfinAudioPlayer.xcodeproj", ) Dir.chdir("..") do sh( @@ -69,11 +72,15 @@ end platform :android do desc "Generate beta build" lane :beta do + android_set_version_name( + version_name: package['version'], + gradle_file: "android/app/build.gradle" + ) + android_set_version_code( + gradle_file: "android/app/build.gradle" + ) gradle( task: "assembleRelease", - properties: { - 'versionName' => package["version"], - }, project_dir: "android" ) end diff --git a/fastlane/Pluginfile b/fastlane/Pluginfile index 7bdc060..05acd02 100644 --- a/fastlane/Pluginfile +++ b/fastlane/Pluginfile @@ -4,3 +4,4 @@ gem 'fastlane-plugin-sentry' gem 'fastlane-plugin-load_json' +gem 'fastlane-plugin-versioning_android' diff --git a/ios/JellyfinAudioPlayer.xcodeproj/project.pbxproj b/ios/JellyfinAudioPlayer.xcodeproj/project.pbxproj index b18d729..f418cac 100644 --- a/ios/JellyfinAudioPlayer.xcodeproj/project.pbxproj +++ b/ios/JellyfinAudioPlayer.xcodeproj/project.pbxproj @@ -554,7 +554,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 31; + CURRENT_PROJECT_VERSION = 33; DEVELOPMENT_TEAM = 238P3C58WC; ENABLE_BITCODE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -590,7 +590,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 31; + CURRENT_PROJECT_VERSION = 33; DEVELOPMENT_TEAM = 238P3C58WC; INFOPLIST_FILE = JellyfinAudioPlayer/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; diff --git a/ios/JellyfinAudioPlayer/Info.plist b/ios/JellyfinAudioPlayer/Info.plist index 15c3fc7..6d3b077 100644 --- a/ios/JellyfinAudioPlayer/Info.plist +++ b/ios/JellyfinAudioPlayer/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0 + 0.2.3 CFBundleSignature ???? CFBundleVersion - 31 + 33 LSRequiresIPhoneOS NSAppTransportSecurity diff --git a/ios/JellyfinAudioPlayerTests/Info.plist b/ios/JellyfinAudioPlayerTests/Info.plist index eedf48a..5fd0e42 100644 --- a/ios/JellyfinAudioPlayerTests/Info.plist +++ b/ios/JellyfinAudioPlayerTests/Info.plist @@ -15,10 +15,10 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 1.0 + 0.2.3 CFBundleSignature ???? CFBundleVersion - 31 + 33