chore: update dependencies

jellyflix-app · Nov 2, 2024 · 559a85b · 559a85b
1 parent e53faf6
commit 559a85b
Show file tree

Hide file tree

Showing 15 changed files with 247 additions and 242 deletions.
diff --git a/.metadata b/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "9e1c857886f07d342cf106f2cd588bcd5e031bb2"
+  revision: "603104015dd692ea3403755b55d07813d5cf8965"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
     - platform: android
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-    - platform: ios
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-    - platform: linux
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-    - platform: macos
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-    - platform: web
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-    - platform: windows
-      create_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
-      base_revision: 9e1c857886f07d342cf106f2cd588bcd5e031bb2
+      create_revision: 603104015dd692ea3403755b55d07813d5cf8965
+      base_revision: 603104015dd692ea3403755b55d07813d5cf8965
 
   # User provided section
 

diff --git a/android/.gitignore b/android/.gitignore
@@ -7,7 +7,7 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
-# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+# See https://flutter.dev/to/reference-keystore
 key.properties
 **/*.keystore
 **/*.jks
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,6 +1,7 @@
 plugins {
     id "com.android.application"
     id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
 
@@ -29,51 +30,45 @@ def keystoreProperties = new Properties()
    }
 
 android {
-    namespace "com.ambark.jellyflix"
-    compileSdkVersion flutter.compileSdkVersion
-    ndkVersion flutter.ndkVersion
+    namespace = "com.ambark.jellyflix"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = 17
     }
 
     defaultConfig {
-        applicationId "com.ambark.jellyflix"
+        applicationId = "com.ambark.jellyflix"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
-        minSdkVersion flutter.minSdkVersion
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode.toInteger()
+        versionName = flutter.versionName
     }
 
     signingConfigs {
         release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
-            storePassword keystoreProperties['storePassword']
+            keyAlias = keystoreProperties['keyAlias']
+            keyPassword = keystoreProperties['keyPassword']
+            storeFile = keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword = keystoreProperties['storePassword']
         }
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
         }
     }
 }
 
 flutter {
-    source '../..'
+    source = "../.."
 }
-
-dependencies {}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,62 +1,72 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-  <uses-feature android:name="android.software.leanback"
-    android:required="false" />
-  <uses-feature android:name="android.hardware.touchscreen"
-    android:required="false" />
-  <application
-    android:label="Jellyflix"
-    android:name="${applicationName}"
-    android:banner="@drawable/banner"
-    android:icon="@mipmap/launcher_icon"
-    android:usesCleartextTraffic="true">
-    <activity
-      android:name=".MainActivity"
-      android:exported="true"
-      android:launchMode="singleTop"
-      android:theme="@style/LaunchTheme"
-      android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
-      android:hardwareAccelerated="true"
-      android:windowSoftInputMode="adjustResize">
-      <!-- Specifies an Android theme to apply to this Activity as soon as
+    <uses-feature android:name="android.software.leanback"
+        android:required="false" />
+    <uses-feature android:name="android.hardware.touchscreen"
+        android:required="false" />
+    <application
+        android:label="Jellyflix"
+        android:name="${applicationName}"
+        android:banner="@drawable/banner"
+        android:icon="@mipmap/launcher_icon"
+        android:usesCleartextTraffic="true">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:launchMode="singleTop"
+            android:taskAffinity=""
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+            <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
-      <meta-data
-        android:name="io.flutter.embedding.android.NormalTheme"
-        android:resource="@style/NormalTheme"
-      />
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>
-    </activity>
-    <!-- Don't delete the meta-data below.
+            <meta-data
+              android:name="io.flutter.embedding.android.NormalTheme"
+              android:resource="@style/NormalTheme"
+              />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
-    <meta-data
-      android:name="flutterEmbedding"
-      android:value="2" />
-
-    <provider
-      android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
-      android:authorities="${applicationId}.flutter_downloader.provider"
-      android:exported="false"
-      android:grantUriPermissions="true">
-      <meta-data
-        android:name="android.support.FILE_PROVIDER_PATHS"
-        android:resource="@xml/provider_paths" />
-    </provider>
-  </application>
-  <!--
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
+        <provider
+            android:name="vn.hunghd.flutterdownloader.DownloadedFileProvider"
+            android:authorities="${applicationId}.flutter_downloader.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+              android:name="android.support.FILE_PROVIDER_PATHS"
+              android:resource="@xml/provider_paths" />
+        </provider>
+    </application>
+    <!--
       Internet access permissions.
       -->
-  <uses-permission android:name="android.permission.INTERNET" />
-  <!--
+    <uses-permission android:name="android.permission.INTERNET" />
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <!--
         Media access permissions.
         Android 13 or higher.
         https://developer.android.com/about/versions/13/behavior-changes-13#granular-media-permissions
         -->
-  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
-
-</manifest>
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
+</manifest>
diff --git a/...e/another_jellyfin_client/MainActivity.kt → ...tlin/com/ambark/jellyflix/MainActivity.kt b/...e/another_jellyfin_client/MainActivity.kt → ...tlin/com/ambark/jellyflix/MainActivity.kt
@@ -2,5 +2,4 @@ package com.ambark.jellyflix
 
 import io.flutter.embedding.android.FlutterActivity
 
-class MainActivity: FlutterActivity() {
-}
+class MainActivity: FlutterActivity()
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,28 +1,16 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
         mavenCentral()
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx4G
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -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-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -5,25 +5,21 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }
-    settings.ext.flutterSdkPath = flutterSdkPath()
+    }()
 
-    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
     repositories {
         google()
         mavenCentral()
         gradlePluginPortal()
     }
-
-    plugins {
-        id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
-    }
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.3.2" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }
 
 include ":app"
diff --git a/lib/services/connectivity_service.dart b/lib/services/connectivity_service.dart
@@ -12,15 +12,15 @@ class ConnectivityService {
   }
 
   Future<bool> checkConnectivityOnce() async {
-    ConnectivityResult result = await Connectivity().checkConnectivity();
-    isConnected =
-        result != ConnectivityResult.none && result != ConnectivityResult.other;
+    List<ConnectivityResult> result = await Connectivity().checkConnectivity();
+    isConnected = result.any((res) =>
+        res != ConnectivityResult.none && res != ConnectivityResult.other);
     return isConnected;
   }
 
-  void _updateConnectionStatus(ConnectivityResult result) {
-    isConnected =
-        result != ConnectivityResult.none && result != ConnectivityResult.other;
+  void _updateConnectionStatus(List<ConnectivityResult> result) {
+    isConnected = result.any((res) =>
+        res != ConnectivityResult.none && res != ConnectivityResult.other);
     _connectionStatusController.add(isConnected);
   }
 }
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -13,12 +13,12 @@ import media_kit_video
 import package_info_plus
 import path_provider_foundation
 import screen_brightness_macos
-import sqflite
+import sqflite_darwin
 import url_launcher_macos
 import wakelock_plus
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
-  ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
+  ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))