Skip to content

Commit

Permalink
Merge pull request #152 from JellyBookOrg/v1.3.1
Browse files Browse the repository at this point in the history
Version 1.3.1
  • Loading branch information
Kara-Zor-El authored Feb 14, 2024
2 parents da470b9 + 9c588cd commit c84933b
Show file tree
Hide file tree
Showing 31 changed files with 979 additions and 802 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,6 @@ flutter_jank_metrics_01.json
Jellyfin/
linux/flutter/generated_plugin_registrant.cc
linux/flutter/generated_plugins.cmake
linux/flutter/generated_plugin_registrant.cc
linux/flutter/generated_plugins.cmake
sentry.json
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,25 +47,25 @@ endif
.PHONY: ios_release
ios_release: create_output_dir
@echo "Building iOS release IPA..."
@flutter build ipa --release >/dev/null 2>&1
@flutter build ipa --release --dart-define-from-file=./sentry.json
@echo "Complete release IPA"
@mv build/ios/ipa/jellybook.ipa "$(OUTPUT_DIR)/JellyBook-Release.ipa"

.PHONY: ios_debug
ios_debug: create_output_dir
@echo "Building iOS debug IPA..."
@flutter build ipa --debug
@flutter build ipa --debug --dart-define-from-file=./sentry.json
@echo "Complete debug IPA"
@mv build/ios/ipa/jellybook.ipa "$(OUTPUT_DIR)/JellyBook-Debug.ipa"

.PHONY: android_release
android_release: create_output_dir
@echo "Building Android release APK..."
@flutter build apk --release
@flutter build apk --release --dart-define-from-file=./sentry.json
@echo "Complete release APK"
@mv build/app/outputs/flutter-apk/app-release.apk "$(OUTPUT_DIR)/JellyBook-Release.apk"
@echo "Building Android release APK (split by ABI)..."
@flutter build apk --split-per-abi --release
@flutter build apk --split-per-abi --release --dart-define-from-file=./sentry.json
@echo "Complete release APK (split by ABI)"
@mv build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk "$(OUTPUT_DIR)/JellyBook-Release-arm32.apk"
@mv build/app/outputs/flutter-apk/app-arm64-v8a-release.apk "$(OUTPUT_DIR)/JellyBook-Release-arm64.apk"
Expand All @@ -74,11 +74,11 @@ android_release: create_output_dir
.PHONY: android_debug
android_debug: create_output_dir
@echo "Building Android debug APK..."
@flutter build apk --debug
@flutter build apk --debug --dart-define-from-file=./sentry.json
@echo "Complete debug APK"
@mv build/app/outputs/flutter-apk/app-debug.apk "$(OUTPUT_DIR)/JellyBook-Debug.apk"
@echo "Building Android debug APK (split by ABI)..."
@flutter build apk --split-per-abi --debug
@flutter build apk --split-per-abi --debug --dart-define-from-file=./sentry.json
@echo "Complete debug APK (split by ABI)"
@mv build/app/outputs/flutter-apk/app-armeabi-v7a-debug.apk "$(OUTPUT_DIR)/JellyBook-Debug-arm32.apk"
@mv build/app/outputs/flutter-apk/app-arm64-v8a-debug.apk "$(OUTPUT_DIR)/JellyBook-Debug-arm64.apk"
Expand All @@ -87,14 +87,14 @@ android_debug: create_output_dir
.PHONY: app_bundle_release
app_bundle_release: create_output_dir
@echo "Building Android release App Bundle..."
@flutter build appbundle --release
@flutter build appbundle --release --dart-define-from-file=./sentry.json
@echo "Complete release App Bundle"
@mv build/app/outputs/bundle/release/app-release.aab "$(OUTPUT_DIR)/JellyBook-Release.aab"

.PHONY: app_bundle_debug
app_bundle_debug: create_output_dir
@echo "Building Android debug App Bundle..."
@flutter build appbundle --debug
@flutter build appbundle --debug --dart-define-from-file=./sentry.json
@echo "Complete debug App Bundle"
@mv build/app/outputs/bundle/debug/app-debug.aab "$(OUTPUT_DIR)/JellyBook-Debug.aab"

Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,8 @@
- Thank you to [u/anekdotos](https://reddit.com/u/anekdotos) on Reddit for donating to the project so it could be published on iOS
- Thank you to Weblate for hosting translation
- Thank you to IzzyOnDroid for packaging and hosting the app on their repo
- Thank you to [Sentry](https://sentry.io) for providing error tracking (with their open source plan)
- And of course, thank you to all the contributors and users of the app

## 🤔 Why is Development so Slow?
- I am a full time student and work part time. I recently had midterms come up which caused me to have to slow down on my working on this project. This project is really fun to work on for me but that being said, without making any money from it or receiving any donations my ability to work on this project is hindered. This is since I do need money to help pay for my education and living expenses. I would really love to be able to work on open source full time but unfortunately that is not possible at this current time to work on it like how I was previously.
Expand Down
47 changes: 0 additions & 47 deletions build-android.sh

This file was deleted.

110 changes: 0 additions & 110 deletions build.sh

This file was deleted.

40 changes: 20 additions & 20 deletions ios/Flutter/AppFrameworkInfo.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>App</string>
<key>CFBundleIdentifier</key>
<string>io.flutter.flutter.app</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>App</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>App</string>
<key>CFBundleIdentifier</key>
<string>io.flutter.flutter.app</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>App</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
46 changes: 28 additions & 18 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ PODS:
- Flutter
- flutter_secure_storage (6.0.0):
- Flutter
- FMDB (2.7.5):
- FMDB/standard (= 2.7.5)
- FMDB/standard (2.7.5)
- image_picker_ios (0.0.1):
- Flutter
- isar_flutter_libs (1.0.0):
Expand All @@ -29,15 +26,22 @@ PODS:
- FlutterMacOS
- pdfx (1.0.0):
- Flutter
- permission_handler_apple (9.1.1):
- permission_handler_apple (9.3.0):
- Flutter
- ReachabilitySwift (5.0.0)
- Sentry/HybridSDK (8.19.0):
- SentryPrivate (= 8.19.0)
- sentry_flutter (0.0.1):
- Flutter
- FlutterMacOS
- Sentry/HybridSDK (= 8.19.0)
- SentryPrivate (8.19.0)
- shared_preferences_foundation (0.0.1):
- Flutter
- FlutterMacOS
- sqflite (0.0.3):
- Flutter
- FMDB (>= 2.7.5)
- FlutterMacOS
- unrar_file (0.0.1):
- Flutter
- UnrarKit
Expand All @@ -62,15 +66,17 @@ DEPENDENCIES:
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- pdfx (from `.symlinks/plugins/pdfx/ios`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- sentry_flutter (from `.symlinks/plugins/sentry_flutter/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- sqflite (from `.symlinks/plugins/sqflite/darwin`)
- unrar_file (from `.symlinks/plugins/unrar_file/ios`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)

SPEC REPOS:
trunk:
- FMDB
- ReachabilitySwift
- Sentry
- SentryPrivate
- UnrarKit

EXTERNAL SOURCES:
Expand Down Expand Up @@ -102,10 +108,12 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/pdfx/ios"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"
sentry_flutter:
:path: ".symlinks/plugins/sentry_flutter/ios"
shared_preferences_foundation:
:path: ".symlinks/plugins/shared_preferences_foundation/darwin"
sqflite:
:path: ".symlinks/plugins/sqflite/ios"
:path: ".symlinks/plugins/sqflite/darwin"
unrar_file:
:path: ".symlinks/plugins/unrar_file/ios"
url_launcher_ios:
Expand All @@ -115,25 +123,27 @@ SPEC CHECKSUMS:
audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
connectivity_plus: bf0076dd84a130856aa636df1c71ccaff908fa1d
device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_background_service_ios: e30e0d3ee69e4cee66272d0c78eacd48c2e94aac
flutter_html_to_pdf: 0fd9f8d04f335d68b06a7c4ab5fc85d22e1ef91b
flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
image_picker_ios: 99dfe1854b4fa34d0364e74a78448a0151025425
isar_flutter_libs: b69f437aeab9c521821c3f376198c4371fa21073
open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
path_provider_foundation: 3784922295ac71e43754bd15e0653ccfd36a147c
pdfx: 7b876b09de8b7a0bf444a4f82b439ffcff4ee1ec
permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
permission_handler_apple: 036b856153a2b1f61f21030ff725f3e6fece2b78
ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
sqflite: 31f7eba61e3074736dff8807a9b41581e4f7f15a
Sentry: 1ebcaef678a27c8ac515f974cb5425dd1bbdec2f
sentry_flutter: ecdfbedee55337205561cfa782ee02d31ec83e1f
SentryPrivate: 765c9b4ebe9ac1a5fcdc067c5a1cfbf3f10e1677
shared_preferences_foundation: b4c3b4cddf1c21f02770737f147a3f5da9d39695
sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
unrar_file: ead248ffb2e777cb67f083bc1bb1fb45d4157dbd
UnrarKit: 99e3f0222a98a212188e1a6975dcf5aa798d26dd
url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812

PODFILE CHECKSUM: 4523b5d271d7828b6cdc73fe8b32bf7b646e71e2
PODFILE CHECKSUM: 279a2687027fca19455562b68ccfb66f53b9663e

COCOAPODS: 1.14.3
COCOAPODS: 1.15.2
Loading

0 comments on commit c84933b

Please sign in to comment.