From 80fb1c0794ea941057fb1f2d5d2f06466d8e7fd1 Mon Sep 17 00:00:00 2001 From: Lucas Delanier Date: Sat, 29 Jul 2023 21:58:56 +0200 Subject: [PATCH] manage multiple song playing --- Sources/justMUSIC/.metadata | 25 ++++--------------- Sources/justMUSIC/android/app/build.gradle | 11 ++++++-- .../android/app/src/debug/AndroidManifest.xml | 3 +-- .../android/app/src/main/AndroidManifest.xml | 5 ++-- .../app/FlutterMultiDexApplication.java | 25 +++++++++++++++++++ .../app/src/profile/AndroidManifest.xml | 3 +-- Sources/justMUSIC/android/build.gradle | 12 ++++++--- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 8 files changed, 53 insertions(+), 33 deletions(-) create mode 100644 Sources/justMUSIC/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java diff --git a/Sources/justMUSIC/.metadata b/Sources/justMUSIC/.metadata index e1179a6..732ba6d 100644 --- a/Sources/justMUSIC/.metadata +++ b/Sources/justMUSIC/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled. version: - revision: 18a827f3933c19f51862dde3fa472197683249d6 + revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 channel: stable project_type: app @@ -13,26 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 - platform: android - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 - - platform: ios - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 - - platform: linux - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 - - platform: macos - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 - - platform: web - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 - - platform: windows - create_revision: 18a827f3933c19f51862dde3fa472197683249d6 - base_revision: 18a827f3933c19f51862dde3fa472197683249d6 + create_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 + base_revision: f468f3366c26a5092eb964a230ce7892fda8f2f8 # User provided section diff --git a/Sources/justMUSIC/android/app/build.gradle b/Sources/justMUSIC/android/app/build.gradle index 2c71df3..44f9732 100644 --- a/Sources/justMUSIC/android/app/build.gradle +++ b/Sources/justMUSIC/android/app/build.gradle @@ -1,4 +1,5 @@ def localProperties = new Properties() + def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { localPropertiesFile.withReader('UTF-8') { reader -> @@ -26,9 +27,11 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace "com.example.justmusic" compileSdkVersion 33 ndkVersion flutter.ndkVersion + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 @@ -46,8 +49,8 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.justmusic" // You can update the following values to match your application needs. - // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. - minSdkVersion flutter.minSdkVersion + // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. + minSdkVersion 19 targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -66,6 +69,10 @@ flutter { source '../..' } + dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation(platform("com.google.firebase:firebase-bom:32.2.0")) + implementation 'com.google.firebase:firebase-analytics-ktx' } +apply plugin: 'com.google.gms.google-services' diff --git a/Sources/justMUSIC/android/app/src/debug/AndroidManifest.xml b/Sources/justMUSIC/android/app/src/debug/AndroidManifest.xml index 44a649b..399f698 100644 --- a/Sources/justMUSIC/android/app/src/debug/AndroidManifest.xml +++ b/Sources/justMUSIC/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,4 @@ - +