Skip to content

Commit

Permalink
core: upgrade to flutter 3.22.0
Browse files Browse the repository at this point in the history
+ drop getx
+ migrate to nampack
+ ReorderableList massive performance optimization
+ new custom Dismissible implementation
+ remove font multiplier and use global media query font scaler
+ no longer saving queue of all tracks as empty
+ remove search limiter
+ disable reordering when leaving playlist page
+ general changes & improvements (lazy to categorize)
+ more bugs
  • Loading branch information
MSOB7YY committed Jun 6, 2024
1 parent 826095d commit ea571a8
Show file tree
Hide file tree
Showing 176 changed files with 9,513 additions and 7,323 deletions.
36 changes: 36 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "flutter",
"command": "flutter",
"args": ["build", "apk"],
"group": {
"kind": "build",
"isDefault": false
},
"problemMatcher": [],
"label": "flutter: flutter build apk",
"detail": ""
},
{
"type": "flutter",
"command": "flutter",
"args": [
"build",
"apk",
"--target-platform",
"android-arm64",
"--release",
"-v"
],
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": [],
"label": "build flutter apk arm64",
"detail": ""
}
]
}
10 changes: 9 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@

# The following line activates a set of recommended lints for Flutter apps,
# packages, and plugins designed to encourage good coding practices.
analyzer:
plugins:
- custom_lint
errors:
unnecessary_this: ignore
use_string_in_part_of_directives: ignore

custom_lint:

include: package:flutter_lints/flutter.yaml

linter:
Expand All @@ -24,6 +33,5 @@ linter:
rules:
# avoid_print: false # Uncomment to disable the `avoid_print` rule
# prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule

# Additional information about this file can be found at
# https://dart.dev/guides/language/analysis-options
16 changes: 6 additions & 10 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -27,10 +28,6 @@ if (flutterVersionName == null) {
// keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
// }

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 34
ndkVersion flutter.ndkVersion
Expand Down Expand Up @@ -130,7 +127,6 @@ repositories {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'net.jthink:jaudiotagger:3.0.1'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.3'
Expand Down
16 changes: 0 additions & 16 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
buildscript {
ext.kotlin_version = '1.8.22'
repositories {
google()
mavenCentral()
maven { url 'https://jitpack.io' }
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand All @@ -24,8 +10,6 @@ allprojects {
rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')
}

Expand Down
30 changes: 22 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
include ':app'
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}()

def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
def properties = new Properties()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "7.4.0" apply false
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
}

include ":app"
Loading

0 comments on commit ea571a8

Please sign in to comment.