mirror of
https://github.com/sudoxnym/fdroiddata.git
synced 2026-05-17 19:29:13 +00:00
misc fixes
This commit is contained in:
parent
585e4004f1
commit
610056c42c
13 changed files with 187 additions and 92 deletions
|
|
@ -46,11 +46,13 @@ Builds:
|
|||
subdir: app
|
||||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt-get install -y openjdk-11-jdk
|
||||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- fdroid
|
||||
prebuild: echo 'android { lintOptions { isAbortOnError = false }}' >> build.gradle.kts
|
||||
prebuild: sed -i -e '/val keystorePropertiesFile/,/^}/d' build.gradle.kts
|
||||
scandelete:
|
||||
- app
|
||||
|
||||
AutoUpdateMode: Version
|
||||
UpdateCheckMode: Tags
|
||||
|
|
|
|||
|
|
@ -28,29 +28,16 @@ Builds:
|
|||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
- $$flutter$$/bin/flutter build apk
|
||||
|
||||
- versionName: 2.2.0
|
||||
versionCode: 21
|
||||
commit: 0ab420ffd010a5cfed2e4734694bebcbf074158c
|
||||
output: build/app/outputs/apk/release/app-release-unsigned.apk
|
||||
srclibs:
|
||||
- flutter@2.8.0-3.3.pre
|
||||
rm:
|
||||
- ios
|
||||
- linux
|
||||
- web
|
||||
build:
|
||||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
- $$flutter$$/bin/flutter build apk
|
||||
|
||||
- versionName: 2.2.1
|
||||
versionCode: 22
|
||||
commit: 1c5aeabe9ca3bfd6af3413f7e4c9709770a0cf71
|
||||
output: build/app/outputs/apk/release/app-release-unsigned.apk
|
||||
srclibs:
|
||||
- flutter@2.8.0-3.3.pre
|
||||
- flutter@2.11.0-0.1.pre
|
||||
rm:
|
||||
- ios
|
||||
- linux
|
||||
- test
|
||||
- web
|
||||
build:
|
||||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
|
|
|
|||
|
|
@ -250,17 +250,14 @@ Builds:
|
|||
gradle:
|
||||
- yes
|
||||
|
||||
- versionName: 4.0.7
|
||||
versionCode: 1242
|
||||
commit: 1261821d13449ab94c8b40f94608f294ac27aae1
|
||||
subdir: app
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
- versionName: 4.0.8
|
||||
versionCode: 1243
|
||||
commit: b4b62cf260bcc2121c0e752b753aca9b46b14b5c
|
||||
subdir: app
|
||||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
|
|
|
|||
|
|
@ -224,6 +224,10 @@ Builds:
|
|||
versionCode: 41
|
||||
commit: b937da25e0dd94b76dd5ce1cc01b32ddcb9e548c
|
||||
subdir: app
|
||||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
|
|
|
|||
|
|
@ -584,8 +584,6 @@ Builds:
|
|||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- libre
|
||||
scanignore:
|
||||
- app/src/main/assets/publicsuffixes
|
||||
ndk: r21e
|
||||
|
||||
MaintainerNotes: |-
|
||||
|
|
|
|||
|
|
@ -8911,42 +8911,6 @@ Builds:
|
|||
scandelete:
|
||||
- src/androidTest
|
||||
|
||||
- versionName: '20220217'
|
||||
versionCode: 20220217
|
||||
commit: 64c82594bb7c261adea1301962193cdac420e85f
|
||||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- versionDev
|
||||
rm:
|
||||
- user_manual
|
||||
prebuild:
|
||||
- mkdir -p $HOME/.gradle
|
||||
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
|
||||
> $HOME/.gradle/gradle.properties
|
||||
scandelete:
|
||||
- src/androidTest
|
||||
|
||||
- versionName: '20220218'
|
||||
versionCode: 20220218
|
||||
commit: d1bb2b60c1d1ec88e65d17a52203c1d0f662bbb7
|
||||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- versionDev
|
||||
rm:
|
||||
- user_manual
|
||||
prebuild:
|
||||
- mkdir -p $HOME/.gradle
|
||||
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
|
||||
> $HOME/.gradle/gradle.properties
|
||||
scandelete:
|
||||
- src/androidTest
|
||||
|
||||
- versionName: '20220219'
|
||||
versionCode: 20220219
|
||||
commit: ac0211729466a85efb98359efaee6e42741a4209
|
||||
|
|
@ -8962,8 +8926,6 @@ Builds:
|
|||
- mkdir -p $HOME/.gradle
|
||||
- echo "org.gradle.jvmargs=-Xmx9g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError"
|
||||
> $HOME/.gradle/gradle.properties
|
||||
scandelete:
|
||||
- src/androidTest
|
||||
|
||||
MaintainerNotes: Tags get removed. See https://github.com/nextcloud/android/issues/969.
|
||||
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ Builds:
|
|||
- yes
|
||||
ndk: r21e
|
||||
|
||||
- versionName: 4.0.0
|
||||
- versionName: 4.0.0/X
|
||||
versionCode: 400
|
||||
commit: 2372115e66a4c5fa791a585d6eccd723ee2aeab1
|
||||
subdir: term
|
||||
|
|
@ -204,10 +204,10 @@ Builds:
|
|||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- yes
|
||||
- full
|
||||
ndk: r21e
|
||||
|
||||
AutoUpdateMode: Version v%v
|
||||
AutoUpdateMode: Version
|
||||
UpdateCheckMode: Tags
|
||||
CurrentVersion: 4.0.0
|
||||
CurrentVersion: 4.0.0/X
|
||||
CurrentVersionCode: 400
|
||||
|
|
|
|||
|
|
@ -32,13 +32,17 @@ Builds:
|
|||
versionCode: 17
|
||||
commit: 1632538fbec0b8138b96750852428e48e570ae44
|
||||
patch:
|
||||
- remove_youtube_sentry_support.diff
|
||||
- remove_internet_permission.diff
|
||||
- remove_youtube_sentry_support_17.diff
|
||||
output: build/app/outputs/flutter-apk/app-release.apk
|
||||
srclibs:
|
||||
- flutter@2.5.3
|
||||
- flutter@2.10.1
|
||||
rm:
|
||||
- ios
|
||||
prebuild:
|
||||
- sed -i -e '/INTERNET/d' -e '/ACCESS_NETWORK_STATE/d' android/app/src/main/AndroidManifest.xml
|
||||
- sed -i -e '/^ sentry:/,/^ version:/d' -e '/^ sentry_flutter:/,/^ version:/d'
|
||||
pubspec.lock
|
||||
- sed -i -e '/sentry_flutter/d' pubspec.yaml
|
||||
build:
|
||||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
- $$flutter$$/bin/flutter build apk --release
|
||||
|
|
|
|||
|
|
@ -0,0 +1,155 @@
|
|||
diff --git a/lib/audio/tracksPage.dart b/lib/audio/tracksPage.dart
|
||||
index 20a6a38..5f2bb77 100644
|
||||
--- a/lib/audio/tracksPage.dart
|
||||
+++ b/lib/audio/tracksPage.dart
|
||||
@@ -11,7 +11,6 @@ import 'package:mighty_plug_manager/audio/widgets/media_library/media_browse.dar
|
||||
import 'package:path/path.dart';
|
||||
import 'audioEditor.dart';
|
||||
import 'models/jamTrack.dart';
|
||||
-import 'online_sources/YoutubeSource.dart';
|
||||
import 'online_sources/onlineTrack.dart';
|
||||
import 'trackdata/trackData.dart';
|
||||
import 'widgets/online_source/online_source.dart';
|
||||
@@ -333,24 +332,6 @@ class _TracksPageState extends State<TracksPage>
|
||||
});
|
||||
}
|
||||
|
||||
- void addFromYoutubeSource(BuildContext context) {
|
||||
- Navigator.of(context)
|
||||
- .push(MaterialPageRoute(
|
||||
- builder: (context) => OnlineSearchScreen(source: YoutubeSource())))
|
||||
- .then((value) {
|
||||
- if (value is List<OnlineTrack>) {
|
||||
- for (int i = 0; i < value.length; i++) {
|
||||
- var name = "${value[i].artist} - ${value[i].title}";
|
||||
- TrackData().addTrack(value[i].url, name);
|
||||
- }
|
||||
- //clear filter and scroll to bottom
|
||||
- searchCtrl.text = "";
|
||||
- setState(() {});
|
||||
- _scollToNewSongs();
|
||||
- }
|
||||
- });
|
||||
- }
|
||||
-
|
||||
void _scollToNewSongs() async {
|
||||
await Future.delayed(Duration(milliseconds: 300));
|
||||
scrollController.animateTo(scrollController.position.maxScrollExtent,
|
||||
@@ -426,18 +407,6 @@ class _TracksPageState extends State<TracksPage>
|
||||
// Menu items
|
||||
items: [
|
||||
// Floating action menu item
|
||||
- if (kDebugMode)
|
||||
- Bubble(
|
||||
- title: "Youtube",
|
||||
- iconColor: Colors.white,
|
||||
- bubbleColor: Colors.red,
|
||||
- icon: Icons.ondemand_video_outlined,
|
||||
- titleStyle: TextStyle(
|
||||
- fontSize: 16, color: Colors.white),
|
||||
- onPress: () {
|
||||
- _animationController.reverse();
|
||||
- addFromYoutubeSource(context);
|
||||
- }),
|
||||
if (kDebugMode)
|
||||
Bubble(
|
||||
title: "Online Source",
|
||||
diff --git a/lib/bluetooth/NuxDeviceControl.dart b/lib/bluetooth/NuxDeviceControl.dart
|
||||
index b4d1f0c..c8cd568 100644
|
||||
--- a/lib/bluetooth/NuxDeviceControl.dart
|
||||
+++ b/lib/bluetooth/NuxDeviceControl.dart
|
||||
@@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter_blue/flutter_blue.dart';
|
||||
import 'package:mighty_plug_manager/bluetooth/devices/NuxMighty8BT.dart';
|
||||
import 'package:mighty_plug_manager/platform/simpleSharedPrefs.dart';
|
||||
-import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
import 'package:undo/undo.dart';
|
||||
|
||||
import 'bleMidiHandler.dart';
|
||||
@@ -628,12 +627,6 @@ class NuxDeviceControl extends ChangeNotifier {
|
||||
|
||||
diagData.device = "${_device.productName} ${_device.productVersion}";
|
||||
if (connected != null) diagData.connected = connected;
|
||||
-
|
||||
- Sentry.configureScope((scope) {
|
||||
- scope.setTag(
|
||||
- "nuxDevice", "${_device.productName} ${_device.productVersion}");
|
||||
- scope.setContexts('NUX', diagData.toMap(includeJsonPreset));
|
||||
- });
|
||||
}
|
||||
|
||||
NuxDevice get device => _device;
|
||||
diff --git a/lib/main.dart b/lib/main.dart
|
||||
index adcfaa7..9570ef8 100644
|
||||
--- a/lib/main.dart
|
||||
+++ b/lib/main.dart
|
||||
@@ -11,7 +11,6 @@ import 'package:mighty_plug_manager/bluetooth/devices/presets/presetsStorage.dar
|
||||
import 'package:mighty_plug_manager/midi/MidiControllerManager.dart';
|
||||
import 'package:mighty_plug_manager/platform/simpleSharedPrefs.dart';
|
||||
import 'package:permission_handler/permission_handler.dart';
|
||||
-import 'package:sentry_flutter/sentry_flutter.dart';
|
||||
import 'UI/popups/alertDialogs.dart';
|
||||
import 'UI/widgets/NuxAppBar.dart' as NuxAppBar;
|
||||
import 'UI/widgets/nestedWillPopScope.dart';
|
||||
@@ -30,7 +29,6 @@ import 'UI/pages/jamTracks.dart';
|
||||
import 'UI/pages/settings.dart';
|
||||
|
||||
//recreate this file with your own api keys
|
||||
-import 'configKeys.dart';
|
||||
|
||||
//able to create snackbars/messages everywhere
|
||||
final navigatorKey = GlobalKey<NavigatorState>();
|
||||
@@ -49,53 +47,9 @@ void main() {
|
||||
WidgetsFlutterBinding.ensureInitialized();
|
||||
SharedPrefs prefs = SharedPrefs();
|
||||
|
||||
- //capture flutter errors
|
||||
- if (!kDebugMode)
|
||||
- FlutterError.onError = (FlutterErrorDetails details) {
|
||||
- print("");
|
||||
- DebugConsole.print("Flutter error: ${details.toString()}");
|
||||
-
|
||||
- //update diagnostics with json preset
|
||||
- NuxDeviceControl().updateDiagnosticsData(includeJsonPreset: true);
|
||||
-
|
||||
- // Send report
|
||||
- Sentry.captureException(
|
||||
- details,
|
||||
- stackTrace: details.stack,
|
||||
- );
|
||||
- };
|
||||
-
|
||||
- if (!kDebugMode) {
|
||||
- runZonedGuarded(() {
|
||||
- prefs.waitLoading().then((value) async {
|
||||
- if (!kDebugMode) {
|
||||
- await SentryFlutter.init((options) {
|
||||
- options.dsn = sentryDsn;
|
||||
- });
|
||||
- }
|
||||
- mainRunApp();
|
||||
- });
|
||||
- }, (Object error, StackTrace stackTrace) async {
|
||||
- // Whenever an error occurs, call the `_reportError` function. This sends
|
||||
- // Dart errors to the dev console or Sentry depending on the environment.
|
||||
- //_reportError(error, stackTrace);
|
||||
-
|
||||
- DebugConsole.print("Dart error: ${error.toString()}");
|
||||
- DebugConsole.print(stackTrace);
|
||||
-
|
||||
- //update diagnostics with json preset
|
||||
- NuxDeviceControl().updateDiagnosticsData(includeJsonPreset: true);
|
||||
-
|
||||
- await Sentry.captureException(
|
||||
- error,
|
||||
- stackTrace: stackTrace,
|
||||
- );
|
||||
- });
|
||||
- } else {
|
||||
prefs.waitLoading().then((value) {
|
||||
mainRunApp();
|
||||
});
|
||||
- }
|
||||
}
|
||||
|
||||
mainRunApp() {
|
||||
|
|
@ -805,6 +805,7 @@ Builds:
|
|||
build:
|
||||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
- $$flutter$$/bin/flutter build apk
|
||||
ndk: r21
|
||||
|
||||
AutoUpdateMode: Version f-droid-%v
|
||||
UpdateCheckMode: Tags ^f-droid
|
||||
|
|
|
|||
|
|
@ -300,25 +300,6 @@ Builds:
|
|||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
- $$flutter$$/bin/flutter build apk
|
||||
|
||||
- versionName: 0.2.4
|
||||
versionCode: 24
|
||||
commit: 0db8c2bc1a912e1159522e00c46d2730b9c29fe5
|
||||
subdir: task
|
||||
output: build/app/outputs/flutter-apk/app-release.apk
|
||||
srclibs:
|
||||
- flutter@2.8.1
|
||||
rm:
|
||||
- task/ios
|
||||
- task/linux
|
||||
- task/macos
|
||||
- task/test
|
||||
- task/test_driver
|
||||
- task/tools
|
||||
- task/windows
|
||||
build:
|
||||
- $$flutter$$/bin/flutter config --no-analytics
|
||||
- $$flutter$$/bin/flutter build apk
|
||||
|
||||
- versionName: 0.2.5
|
||||
versionCode: 25
|
||||
commit: ad105b9aa5a6160b23ac94d7c20d9e5f66a585b9
|
||||
|
|
|
|||
|
|
@ -398,6 +398,7 @@ Builds:
|
|||
|
||||
- versionName: 5.20.1
|
||||
versionCode: 520000001
|
||||
disable: ndk r24
|
||||
commit: 28f8d19e3a0431e54201e030b2ca558d5e5b44c1
|
||||
subdir: android5/app
|
||||
submodules: true
|
||||
|
|
@ -411,7 +412,6 @@ Builds:
|
|||
- unzip -P default_blocklist src/main/assets/default_blocklist.zip default_blocklist
|
||||
-d src/main/assets
|
||||
- rm src/main/assets/default_blocklist.zip
|
||||
- sed -i -e 's/21.3.6528147/21.4.7075529/' build.gradle
|
||||
build:
|
||||
- $$rustup$$/rustup-init.sh -y
|
||||
- source $HOME/.cargo/env
|
||||
|
|
@ -423,7 +423,7 @@ Builds:
|
|||
- cd ../..
|
||||
- ./build.boringtun.sh
|
||||
- ./build.blocka.sh
|
||||
ndk: r21e
|
||||
ndk: r24
|
||||
|
||||
AutoUpdateMode: Version android-v%v
|
||||
UpdateCheckMode: Tags ^android-v[0-9.]+$
|
||||
|
|
|
|||
|
|
@ -44,6 +44,10 @@ Builds:
|
|||
versionCode: 8
|
||||
commit: 9abb32893069f5fb790fd94527fa839a844515f9
|
||||
subdir: app
|
||||
sudo:
|
||||
- apt-get update || apt-get update
|
||||
- apt-get install -y openjdk-11-jdk-headless
|
||||
- update-alternatives --auto java
|
||||
gradle:
|
||||
- yes
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue