diff --git a/android/app/proguard-rules.pro b/android/app/proguard-rules.pro index 4b6a1162..371e88f2 100644 --- a/android/app/proguard-rules.pro +++ b/android/app/proguard-rules.pro @@ -7,4 +7,6 @@ # For more details, see # http://developer.android.com/guide/developing/tools/proguard.html -# Add any project specific keep options here: \ No newline at end of file +# Add any project specific keep options here: + +-dontwarn com.arthenica.smartexception.java.Exceptions \ No newline at end of file diff --git a/android/ffmpeg-kit-binaries/build.gradle.kts b/android/ffmpeg-kit-binaries/build.gradle.kts new file mode 100644 index 00000000..6191a0bc --- /dev/null +++ b/android/ffmpeg-kit-binaries/build.gradle.kts @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file("ffmpeg-kit-audio-6.0-2.aar")) \ No newline at end of file diff --git a/android/ffmpeg-kit-binaries/ffmpeg-kit-audio-6.0-2.aar b/android/ffmpeg-kit-binaries/ffmpeg-kit-audio-6.0-2.aar new file mode 100644 index 00000000..978bb09f Binary files /dev/null and b/android/ffmpeg-kit-binaries/ffmpeg-kit-audio-6.0-2.aar differ diff --git a/android/settings.gradle b/android/settings.gradle index f5764592..b1a9ee5f 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -3,6 +3,7 @@ plugins { id("com.facebook.react.settings") } extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() } rootProject.name = 'azusa-player-mobile' +include ':ffmpeg-kit-binaries' include ':app' includeBuild('../node_modules/@react-native/gradle-plugin') diff --git a/package.json b/package.json index 1fa9eb12..0e330337 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,7 @@ "expo-keep-awake": "~14.0.2", "expo-secure-store": "~14.0.1", "fflate": "^0.8.2", - "ffmpeg-kit-react-native": "https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?fbbc6d03202f2e35cce831d4dd16e2cf97a127c6", + "ffmpeg-kit-react-native": "https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?5e440832f1641c5209c561e434f166ef83593465", "he": "^1.2.0", "i18next": "23.16.8", "intl-pluralrules": "^2.0.1", diff --git a/yarn.lock b/yarn.lock index dad2c952..3f4d0c5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5647,7 +5647,7 @@ __metadata: expo-keep-awake: "npm:~14.0.2" expo-secure-store: "npm:~14.0.1" fflate: "npm:^0.8.2" - ffmpeg-kit-react-native: "https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?fbbc6d03202f2e35cce831d4dd16e2cf97a127c6" + ffmpeg-kit-react-native: "https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?5e440832f1641c5209c561e434f166ef83593465" gts: "npm:^6.0.2" he: "npm:^1.2.0" i18next: "npm:23.16.8" @@ -9380,13 +9380,13 @@ __metadata: languageName: node linkType: hard -"ffmpeg-kit-react-native@https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?fbbc6d03202f2e35cce831d4dd16e2cf97a127c6": +"ffmpeg-kit-react-native@https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?5e440832f1641c5209c561e434f166ef83593465": version: 6.0.2 - resolution: "ffmpeg-kit-react-native@https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?fbbc6d03202f2e35cce831d4dd16e2cf97a127c6" + resolution: "ffmpeg-kit-react-native@https://gitpkg.vercel.app/lovegaoshi/ffmpeg-kit/react-native?5e440832f1641c5209c561e434f166ef83593465" peerDependencies: react: "*" react-native: "*" - checksum: 10c0/8413c394e3768ce04744ae9881aaa5d0d82d14f1c2c5f84390d0250fbe65191de42fadcd25099aaec01a36bd03966ff8c5de1d5fc17f957ff8afdbb2bac8dcd9 + checksum: 10c0/0442fe0f91ee945e26a87ccf2d0a7fedb0ffcf1d72112dc16d309b75e17aa22f63b1125c07657a59d062e266f8f6f3ba2568548140bf0f807f64f31851b880f4 languageName: node linkType: hard