Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update plugin com.android.application to v8 #1258

Merged
merged 3 commits into from
Mar 22, 2024
Merged

chore(deps): update plugin com.android.application to v8 #1258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6150473
chore(deps): update plugin com.android.application to v8
renovate[bot] Mar 18, 2024
50d9d27
fix(neon_files): Switch to open_filex for Gradle 8 support
provokateurin Mar 20, 2024
04f2209
fix(app): Enable core desugaring for Gradle 8 support
provokateurin Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .cspell/dart_flutter.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ cupertino
endtemplate
exclamationmark
expando
filex
gapless
goldens
lerp
Expand Down
5 changes: 4 additions & 1 deletion packages/app/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,10 @@ if (flutterVersionName == null) {
android {
namespace "de.provokateurin.neon"
compileSdkVersion 34
ndkVersion flutter.ndkVersion
ndkVersion "25.1.8937393"

compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
Expand All @@ -48,6 +49,7 @@ android {
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
}

buildTypes {
Expand All @@ -70,4 +72,5 @@ flutter {

dependencies {
implementation('com.github.UnifiedPush:android-foss_embedded_fcm_distributor:1.0.0-beta5')
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
}
2 changes: 1 addition & 1 deletion packages/app/android/settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pluginManagement {

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.4.2" apply false
id "com.android.application" version "8.3.1" apply false
}

include ":app"
8 changes: 4 additions & 4 deletions packages/app/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,14 +826,14 @@ packages:
relative: true
source: path
version: "5.0.2"
open_file:
open_filex:
dependency: transitive
description:
name: open_file
sha256: a5a32d44acb7c899987d0999e1e3cbb0a0f1adebbf41ac813ec6d2d8faa0af20
name: open_filex
sha256: "74e2280754cf8161e860746c3181db2c996d6c1909c7057b738ede4a469816b8"
url: "https://pub.dev"
source: hosted
version: "3.3.2"
version: "4.4.0"
package_config:
dependency: transitive
description:
Expand Down
4 changes: 2 additions & 2 deletions packages/neon/neon_files/lib/src/blocs/files.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import 'package:neon_framework/models.dart';
import 'package:neon_framework/platform.dart';
import 'package:neon_framework/utils.dart';
import 'package:nextcloud/nextcloud.dart';
import 'package:open_file/open_file.dart';
import 'package:open_filex/open_filex.dart';
import 'package:path/path.dart' as p;
import 'package:path_provider/path_provider.dart';
import 'package:queue/queue.dart';
Expand Down Expand Up @@ -139,7 +139,7 @@ class _FilesBloc extends InteractiveBloc implements FilesBloc {
() async {
if (NeonPlatform.instance.canUsePaths) {
final file = await cacheFile(uri, etag);
final result = await OpenFile.open(file.path, type: mimeType);
final result = await OpenFilex.open(file.path, type: mimeType);
if (result.type != ResultType.done) {
throw const UnableToOpenFileException();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/neon/neon_files/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
url: https://github.com/nextcloud/neon
path: packages/neon_framework
nextcloud: ^5.0.2
open_file: ^3.0.0
open_filex: ^4.4.0
path: ^1.0.0
path_provider: ^2.0.0
queue: ^3.0.0
Expand Down