Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/pr-checker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
pull_request:

env:
FLUTTER_VERSION: 3.35.7
FLUTTER_VERSION: 3.41.6

jobs:
lint:
Expand Down
8 changes: 4 additions & 4 deletions android/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ try {
android {
namespace = "com.adeeteya.markdown_editor"
compileSdk = flutter.compileSdkVersion
ndkVersion = "27.0.12077973"
ndkVersion = "28.2.13676358"

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString()
jvmTarget = JavaVersion.VERSION_17.toString()
}

dependenciesInfo {
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
19 changes: 10 additions & 9 deletions android/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
pluginManagement {
val flutterSdkPath = run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}
val flutterSdkPath =
run {
val properties = java.util.Properties()
file("local.properties").inputStream().use { properties.load(it) }
val flutterSdkPath = properties.getProperty("flutter.sdk")
require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
flutterSdkPath
}

includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

Expand All @@ -18,8 +19,8 @@ pluginManagement {

plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.9.1" apply false
id("org.jetbrains.kotlin.android") version "2.1.0" apply false
id("com.android.application") version "8.11.1" apply false
id("org.jetbrains.kotlin.android") version "2.2.20" apply false
}

include(":app")
28 changes: 14 additions & 14 deletions lib/home.dart
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class _HomeState extends State<Home> {

Future<void> _openFilePicker() async {
try {
final FilePickerResult? result = await FilePicker.platform.pickFiles(
final FilePickerResult? result = await FilePicker.pickFiles(
type: FileType.custom,
initialDirectory:
widget.devicePreferenceNotifier.value.defaultFolderPath,
Expand Down Expand Up @@ -195,7 +195,7 @@ class _HomeState extends State<Home> {
);
return;
} else {
final filePath = await FilePicker.platform.saveFile(
final filePath = await FilePicker.saveFile(
dialogTitle: AppLocalizations.of(context)!.saveFileDialogTitle,
fileName: (!kIsWeb && Platform.isWindows) ? null : "$_fileName.md",
initialDirectory:
Expand Down Expand Up @@ -663,18 +663,18 @@ Future<_PrintFonts> _loadPrintFonts() {
final italic = await PdfGoogleFonts.notoSansItalic();
final boldItalic = await PdfGoogleFonts.notoSansBoldItalic();

final fallbackFonts = await Future.wait<pw.Font>([
PdfGoogleFonts.notoSansSymbols2Regular(),
PdfGoogleFonts.notoSansMathRegular(),
PdfGoogleFonts.notoSansJPRegular(),
PdfGoogleFonts.notoSansKRRegular(),
PdfGoogleFonts.notoSansSCRegular(),
PdfGoogleFonts.notoSansArabicRegular(),
PdfGoogleFonts.notoSansHebrewRegular(),
PdfGoogleFonts.notoSansDevanagariRegular(),
PdfGoogleFonts.notoSansThaiLoopedRegular(),
PdfGoogleFonts.notoColorEmoji(),
]);
final fallbackFonts = await Future.wait<pw.Font>([
PdfGoogleFonts.notoSansSymbols2Regular(),
PdfGoogleFonts.notoSansMathRegular(),
PdfGoogleFonts.notoSansJPRegular(),
PdfGoogleFonts.notoSansKRRegular(),
PdfGoogleFonts.notoSansSCRegular(),
PdfGoogleFonts.notoSansArabicRegular(),
PdfGoogleFonts.notoSansHebrewRegular(),
PdfGoogleFonts.notoSansDevanagariRegular(),
PdfGoogleFonts.notoSansThaiLoopedRegular(),
PdfGoogleFonts.notoColorEmoji(),
]);

return _PrintFonts(
regular: regular,
Expand Down
1 change: 1 addition & 0 deletions linux/flutter/generated_plugins.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
)

list(APPEND FLUTTER_FFI_PLUGIN_LIST
jni
)

set(PLUGIN_BUNDLED_LIBRARIES)
Expand Down
2 changes: 0 additions & 2 deletions macos/Flutter/GeneratedPluginRegistrant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ import FlutterMacOS
import Foundation

import file_picker
import path_provider_foundation
import printing
import shared_preferences_foundation
import url_launcher_macos

func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
PrintingPlugin.register(with: registry.registrar(forPlugin: "PrintingPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
Expand Down
Loading
Loading