From f8f964cbfb42cfa54806b28fa9f4d9205e349531 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Mon, 14 Mar 2022 09:16:44 +0900
Subject: [PATCH] =?UTF-8?q?firebase-messaging=E3=81=AEDuplicatePlatformCla?=
 =?UTF-8?q?sses=E5=AF=BE=E7=AD=96=E3=82=92=E8=A6=8B=E7=9B=B4=E3=81=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle         | 15 +++++++--------
 sample_apng/build.gradle |  6 +++---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 6c75612f..2319c43d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,8 +42,8 @@ android {
                 "-Xopt-in=kotlin.ExperimentalStdlibApi",
                 "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
                 "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-                "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
+          //      "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
+          //      "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
         ]
     }
 
@@ -103,6 +103,10 @@ android {
 
     useLibrary 'android.test.base'
     useLibrary 'android.test.mock'
+
+    lintOptions {
+        warning 'DuplicatePlatformClasses'
+    }
 }
 
 static def gitBranch() {
@@ -166,12 +170,7 @@ dependencies {
     kapt 'androidx.annotation:annotation:1.3.0'
 
     // https://firebase.google.com/support/release-notes/android
-    implementation("com.google.firebase:firebase-messaging:23.0.1") {
-        //noinspection DuplicatePlatformClasses,DuplicatePlatformClasses
-        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
-        //noinspection DuplicatePlatformClasses,DuplicatePlatformClasses
-        exclude group: 'commons-logging', module: 'commons-logging'
-    }
+    implementation "com.google.firebase:firebase-messaging:23.0.1"
 
     implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
diff --git a/sample_apng/build.gradle b/sample_apng/build.gradle
index 8cc8ee49..d5afcc19 100644
--- a/sample_apng/build.gradle
+++ b/sample_apng/build.gradle
@@ -39,9 +39,9 @@ android {
         freeCompilerArgs += [
                 "-Xopt-in=kotlin.ExperimentalStdlibApi",
                 "-Xopt-in=kotlinx.coroutines.ExperimentalCoroutinesApi",
-                "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
-                "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-                "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
+//                "-Xopt-in=kotlinx.serialization.ExperimentalSerializationApi",
+//                "-Xopt-in=androidx.compose.foundation.ExperimentalFoundationApi",
+//                "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi",
         ]
     }
 }