Merge branch 'master' of github.com:clangen/musikcube

This commit is contained in:
casey langen 2023-04-14 11:59:11 -07:00
commit 46eff6358f
10 changed files with 53 additions and 26 deletions

View File

@ -1,13 +1,16 @@
0.99.8
* TODO
* added uk_UA localization (@dinolaz)
* update dependencies across all platforms:
- ffmpeg@6.0
- openssl@3.1.0
- libcurl@8.0.1
- libmicrohttpd@0.9.76
- libopenmpt@0.6.9
- asio@1.27.0
* update to PDCursesMod@4.3.6 for Windows builds
* update `musikdroid` to use Android Studio `Flamingo` and update dependencies
* disable update check for `homebrew` builds
--------------------------------------------------------------------------------

View File

@ -71,6 +71,13 @@ add_definitions(
-D_WEBSOCKETPP_CPP11_RANDOM_DEVICE_
-DASIO_STANDALONE)
# disable update check for environments that we know will provided hosted,
# prebuilt binaries.
if (DEFINED ENV{HOMEBREW_PREFIX})
message(STATUS "[build] detected homebrew, disabling update check functionality.")
add_definitions(-DDISABLE_UPDATE_CHECK)
endif()
if (${BUILD_STANDALONE} MATCHES "true")
find_vendor_library(LIBCURL curl)
find_vendor_library(LIBSSL ssl)

2
src/3rdparty/asio vendored

@ -1 +1 @@
Subproject commit 147f7225a96d45a2807a64e443177f621844e51c
Subproject commit f693a3eb7fe72a5f19b975289afc4f437d373d9c

View File

@ -40,8 +40,8 @@
#define MUSIKCUBE_VERSION_MINOR 99
#define MUSIKCUBE_VERSION_PATCH 8
#define MUSIKCUBE_VERSION "0.99.8"
#define MUSIKCUBE_VERSION_COMMIT_HASH "#01addae6"
#define MUSIKCUBE_VERSION_WITH_COMMIT_HASH "0.99.8-#01addae6"
#define MUSIKCUBE_VERSION_COMMIT_HASH "#889d6599"
#define MUSIKCUBE_VERSION_WITH_COMMIT_HASH "0.99.8-#889d6599"
namespace musik {
namespace cube {

View File

@ -351,6 +351,7 @@ void MainLayout::OnTrackChanged(size_t index, musik::core::TrackPtr track) {
}
void MainLayout::RunUpdateCheck() {
#ifndef DISABLE_UPDATE_CHECK
if (!prefs->GetBool(cube::prefs::keys::AutoUpdateCheck, true)) {
return;
}
@ -360,4 +361,5 @@ void MainLayout::RunUpdateCheck() {
UpdateCheck::ShowUpgradeAvailableOverlay(version, url);
}
});
#endif
}

View File

@ -105,7 +105,9 @@ static const std::string arrow = "> ";
static inline std::shared_ptr<ISchema> AdvancedSettingsSchema() {
auto schema = std::make_shared<TSchema<>>();
#ifndef DISABLE_UPDATE_CHECK
schema->AddBool(cube::prefs::keys::AutoUpdateCheck, false);
#endif
#ifdef ENABLE_MINIMIZE_TO_TRAY
schema->AddBool(cube::prefs::keys::MinimizeToTray, false);
schema->AddBool(cube::prefs::keys::StartMinimized, false);
@ -310,6 +312,7 @@ void SettingsLayout::OnAdvancedSettingsActivate(cursespp::TextLabel* label) {
}
void SettingsLayout::OnUpdateDropdownActivate(cursespp::TextLabel* label) {
#ifndef DISABLE_UPDATE_CHECK
updateCheck.Run([this](bool updateRequired, std::string version, std::string url) {
if (updateRequired) {
UpdateCheck::ShowUpgradeAvailableOverlay(version, url, false);
@ -318,6 +321,7 @@ void SettingsLayout::OnUpdateDropdownActivate(cursespp::TextLabel* label) {
UpdateCheck::ShowNoUpgradeFoundOverlay();
}
});
#endif
}
void SettingsLayout::OnThemeDropdownActivate(cursespp::TextLabel* label) {
@ -386,8 +390,9 @@ void SettingsLayout::OnLayout() {
this->saveSessionCheckbox->MoveAndResize(column2, y++, columnCx, kLabelHeight);
this->pluginsDropdown->MoveAndResize(column2, y++, columnCx, kLabelHeight);
this->advancedDropdown->MoveAndResize(column2, y++, columnCx, kLabelHeight);
#ifndef DISABLE_UPDATE_CHECK
this->updateDropdown->MoveAndResize(column2, y++, columnCx, kLabelHeight);
#endif
this->appVersion->MoveAndResize(0, cy - 1, cx, kLabelHeight);
}
@ -445,9 +450,11 @@ void SettingsLayout::InitializeWindows() {
this->serverDropdown->Activated.connect(this, &SettingsLayout::OnServerDropdownActivate);
}
#ifndef DISABLE_UPDATE_CHECK
this->updateDropdown = std::make_shared<TextLabel>();
this->updateDropdown->SetText(arrow + _TSTR("settings_check_for_updates"));
this->updateDropdown->Activated.connect(this, &SettingsLayout::OnUpdateDropdownActivate);
#endif
this->advancedDropdown = std::make_shared<TextLabel>();
this->advancedDropdown->SetText(arrow + _TSTR("settings_advanced_settings"));
@ -496,7 +503,9 @@ void SettingsLayout::InitializeWindows() {
this->saveSessionCheckbox->SetFocusOrder(order++);
this->pluginsDropdown->SetFocusOrder(order++);
this->advancedDropdown->SetFocusOrder(order++);
#ifndef DISABLE_UPDATE_CHECK
this->updateDropdown->SetFocusOrder(order++);
#endif
this->AddWindow(this->libraryTypeDropdown);
this->AddWindow(this->localLibraryLayout);
@ -528,7 +537,9 @@ void SettingsLayout::InitializeWindows() {
this->AddWindow(this->saveSessionCheckbox);
this->AddWindow(this->pluginsDropdown);
this->AddWindow(this->advancedDropdown);
#ifndef DISABLE_UPDATE_CHECK
this->AddWindow(this->updateDropdown);
#endif
this->AddWindow(this->appVersion);
}

View File

@ -18,14 +18,14 @@ android {
applicationId "io.casey.musikcube.remote"
minSdkVersion 21
targetSdk 33
versionCode 113
versionName "0.99.0"
versionCode 114
versionName "0.99.8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
buildTypes {
@ -44,6 +44,7 @@ android {
ext.alwaysUpdateBuildId = false
}
}
namespace 'io.casey.musikcube.remote'
}
@ -61,18 +62,18 @@ dependencies {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation 'com.google.firebase:firebase-analytics:21.2.0'
implementation 'com.google.firebase:firebase-analytics:21.2.2'
implementation 'com.google.firebase:firebase-core:21.1.1'
implementation 'com.google.firebase:firebase-crashlytics:18.3.2'
implementation 'com.google.firebase:firebase-crashlytics:18.3.6'
implementation 'org.slf4j:slf4j-android:1.7.21'
implementation "androidx.room:room-runtime:2.4.3"
kapt "androidx.room:room-compiler:2.4.3"
implementation "androidx.room:room-runtime:2.5.1"
kapt "androidx.room:room-compiler:2.5.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
implementation "androidx.lifecycle:lifecycle-common-java8:2.5.1"
implementation "androidx.lifecycle:lifecycle-common-java8:2.6.1"
compileOnly 'org.glassfish:javax.annotation:10.0-b28'
implementation 'com.google.dagger:dagger:2.42'
@ -86,14 +87,14 @@ dependencies {
implementation 'io.reactivex.rxjava2:rxjava:2.2.16'
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
implementation 'io.reactivex.rxjava2:rxkotlin:2.4.0'
implementation 'com.google.android.exoplayer:exoplayer:2.18.2'
implementation 'com.google.android.exoplayer:extension-okhttp:2.18.2'
implementation 'com.google.android.exoplayer:exoplayer:2.18.5'
implementation 'com.google.android.exoplayer:extension-okhttp:2.18.5'
implementation 'com.simplecityapps:recyclerview-fastscroll:2.0.0'
implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
implementation 'androidx.appcompat:appcompat:1.5.1'
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'com.google.android.material:material:1.8.0-beta01'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.recyclerview:recyclerview:1.3.0'
implementation 'com.google.android.material:material:1.8.0'
implementation 'androidx.media:media:1.6.0'
testImplementation 'junit:junit:4.13.1'

View File

@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.7.20'
ext.kotlin_version = '1.8.0'
repositories {
google()
@ -7,10 +7,10 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.14'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
classpath 'com.google.gms:google-services:4.3.15'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.5'
}
}

View File

@ -4,3 +4,6 @@ org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true
android.suppressUnsupportedCompileSdk=33
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

View File

@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip