From 9d3c36ea0c64fe42195d5546383bfd25f8f74743 Mon Sep 17 00:00:00 2001
From: tateisu <tateisu@gmail.com>
Date: Tue, 24 Aug 2021 07:46:09 +0900
Subject: [PATCH] - exoplayer:2.15.0 - flexbox:3.0.0 - Android Gradle plugin
 4.2.2

---
 .idea/compiler.xml       |  5 -----
 app/build.gradle         |  4 ++--
 build.gradle             |  2 +-
 colorpicker/build.gradle | 31 +++++++++++++++----------------
 4 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index e8373bc9..059436d2 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -3,11 +3,6 @@
   <component name="CompilerConfiguration">
     <bytecodeTargetLevel target="1.8">
       <module name="apng" target="1.7" />
-      <module name="SubwayTooter.apng_android" target="11" />
-      <module name="SubwayTooter.app" target="11" />
-      <module name="SubwayTooter.colorpicker" target="11" />
-      <module name="SubwayTooter.emoji" target="11" />
-      <module name="SubwayTooter.sample_apng" target="11" />
     </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 53a471a0..6233c19a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -186,11 +186,11 @@ dependencies {
 
     implementation 'org.hjson:hjson:3.0.0'
 
-    implementation 'com.google.android:flexbox:2.0.1' // 1.1.0 から AndroidX 依存
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
 
     implementation 'com.astuetz:pagerslidingtabstrip:1.0.1'
 
-    implementation 'com.google.android.exoplayer:exoplayer:2.14.1'
+    implementation 'com.google.android.exoplayer:exoplayer:2.15.0'
     /*
     WARNING: [Processor] Library '…\exoplayer-ui-2.12.0.aar' contains references to both AndroidX and old support library. This seems like the library is partially migrated. Jetifier will try to rewrite the library anyway.
     Example of androidX reference: 'androidx/core/app/NotificationCompat$Builder'
diff --git a/build.gradle b/build.gradle
index 962a6fe8..c01a13a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         classpath 'com.google.gms:google-services:4.3.8'
 
         //noinspection DifferentKotlinGradleVersion
diff --git a/colorpicker/build.gradle b/colorpicker/build.gradle
index 8eb37549..2e905646 100644
--- a/colorpicker/build.gradle
+++ b/colorpicker/build.gradle
@@ -1,31 +1,30 @@
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion compile_sdk_version
+    compileSdkVersion compile_sdk_version
 
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 
-  defaultConfig {
-    targetSdkVersion target_sdk_version
-    minSdkVersion min_sdk_version
-  }
+    defaultConfig {
+        targetSdkVersion target_sdk_version
+        minSdkVersion min_sdk_version
+    }
 
 
-  lintOptions {
-    abortOnError false
-  }
+    lintOptions {
+        abortOnError false
+    }
 
-  resourcePrefix "cpv_"
+    resourcePrefix "cpv_"
 }
 
 dependencies {
-  implementation "androidx.appcompat:appcompat:$appcompat_version"
-
-  implementation 'com.google.android:flexbox:2.0.1'
+    implementation "androidx.appcompat:appcompat:$appcompat_version"
 
+    implementation 'com.google.android.flexbox:flexbox:3.0.0'
 }
 
 //apply plugin: 'com.getkeepsafe.dexcount'