Update Android Gradle Plugin to 8.0.2 (#999)

vanniktech · Jul 2, 2023 · a28207d · a28207d
1 parent 1badbf9
commit a28207d
Show file tree

Hide file tree

Showing 32 changed files with 41 additions and 308 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -4,4 +4,8 @@ continuation_indent_size=2
 insert_final_newline=true
 ij_kotlin_allow_trailing_comma=true
 ij_kotlin_allow_trailing_comma_on_call_site=true
-ktlint_disabled_rules=annotation,argument-list-wrapping,spacing-between-declarations-with-annotations,filename
+ktlint_standard_annotation=disabled
+ktlint_standard_argument-list-wrapping=disabled
+ktlint_standard_spacing-between-declarations-with-annotations=disabled
+ktlint_standard_filename=disabled
+ktlint_standard_property-naming=disabled
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        java_version: [11]
+        java_version: [17]
 
     steps:
       - name: Checkout

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -15,11 +15,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install JDK 11
+      - name: Install JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup gradle
         uses: gradle/gradle-build-action@v2

diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml
@@ -15,11 +15,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Install JDK 11
+      - name: Install JDK 17
         uses: actions/setup-java@v3
         with:
           distribution: 'zulu'
-          java-version: 11
+          java-version: 17
 
       - name: Setup gradle
         uses: gradle/gradle-build-action@v2

diff --git a/app/src/androidTest/kotlin/com/vanniktech/emoji/sample/screenshots/ScreenshotsTest.kt b/app/src/androidTest/kotlin/com/vanniktech/emoji/sample/screenshots/ScreenshotsTest.kt
@@ -67,7 +67,6 @@ import tools.fastlane.screengrab.locale.LocaleTestRule
     IOS("iOS"),
     TWITTER("Twitter"),
     FACEBOOK("Facebook"),
-    ;
   }
 
   private fun start(variant: Variant) {

diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
   <!-- Not mentioned in the docs, but required! -->
-  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+  <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
 
   <!-- Allows storing screenshots on external storage, where it can be accessed by ADB. -->
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />

diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/CustomViewActivity.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/CustomViewActivity.kt
@@ -28,6 +28,7 @@ import com.vanniktech.emoji.installDisableKeyboardInput
 import com.vanniktech.emoji.installForceSingleEmoji
 import com.vanniktech.emoji.sample.databinding.ViewCustomBinding
 import com.vanniktech.emoji.traits.EmojiTrait
+import com.vanniktech.emoji.R as EmojiR
 
 class CustomViewActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
@@ -73,7 +74,7 @@ class CustomViewActivity : AppCompatActivity() {
 
       val emojiPopup = EmojiPopup(
         rootView = this,
-        keyboardAnimationStyle = R.style.emoji_fade_animation_style,
+        keyboardAnimationStyle = EmojiR.style.emoji_fade_animation_style,
         editText = binding.editText,
       )
       binding.editText.installDisableKeyboardInput(emojiPopup)

diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainActivity.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainActivity.kt
@@ -46,6 +46,7 @@ import com.vanniktech.emoji.sample.databinding.ActivityMainBinding
 import com.vanniktech.emoji.traits.EmojiTrait
 import com.vanniktech.emoji.twitter.TwitterEmojiProvider
 import timber.log.Timber
+import com.vanniktech.emoji.R as EmojiR
 
 // We don't care about duplicated code in the sample.
 class MainActivity : AppCompatActivity() {
@@ -78,7 +79,7 @@ class MainActivity : AppCompatActivity() {
       onSoftKeyboardOpenListener = { px -> Timber.d(TAG, "Opened soft keyboard with height $px") },
       onEmojiPopupDismissListener = { binding.chatEmoji.setImageResource(R.drawable.ic_emojis) },
       onSoftKeyboardCloseListener = { Timber.d(TAG, "Closed soft keyboard") },
-      keyboardAnimationStyle = R.style.emoji_fade_animation_style,
+      keyboardAnimationStyle = EmojiR.style.emoji_fade_animation_style,
 //      theming = com.vanniktech.emoji.EmojiTheming( // Uncomment this to use runtime theming.
 //        backgroundColor = android.graphics.Color.BLACK,
 //        primaryColor = android.graphics.Color.BLUE,

diff --git a/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt b/app/src/main/kotlin/com/vanniktech/emoji/sample/MainDialog.kt
@@ -32,6 +32,7 @@ import com.vanniktech.emoji.Emoji
 import com.vanniktech.emoji.EmojiPopup
 import com.vanniktech.emoji.material.MaterialEmojiLayoutFactory
 import timber.log.Timber
+import com.vanniktech.emoji.R as EmojiR
 
 // We don't care about duplicated code in the sample.
 class MainDialog : DialogFragment() {
@@ -63,7 +64,7 @@ class MainDialog : DialogFragment() {
       onSoftKeyboardOpenListener = { px -> Timber.d(TAG, "Opened soft keyboard with height $px") },
       onEmojiPopupDismissListener = { emojiButton.setImageResource(R.drawable.ic_emojis) },
       onSoftKeyboardCloseListener = { Timber.d(TAG, "Closed soft keyboard") },
-      keyboardAnimationStyle = R.style.emoji_fade_animation_style,
+      keyboardAnimationStyle = EmojiR.style.emoji_fade_animation_style,
     )
 
     emojiButton.setColorFilter(ContextCompat.getColor(context, R.color.colorPrimary), PorterDuff.Mode.SRC_IN)

diff --git a/emoji-facebook/build.gradle b/emoji-facebook/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
-  id("org.jetbrains.kotlin.native.cocoapods")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.parcelize")
   id("me.tylerbwong.gradle.metalava")

diff --git a/emoji-facebook/emoji_facebook.podspec b/emoji-facebook/emoji_facebook.podspec
diff --git a/emoji-google-compat/build.gradle b/emoji-google-compat/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
-  id("org.jetbrains.kotlin.native.cocoapods")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.parcelize")
   id("me.tylerbwong.gradle.metalava")

diff --git a/emoji-google-compat/emoji_google_compat.podspec b/emoji-google-compat/emoji_google_compat.podspec
diff --git a/emoji-google/build.gradle b/emoji-google/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
-  id("org.jetbrains.kotlin.native.cocoapods")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.parcelize")
   id("me.tylerbwong.gradle.metalava")

diff --git a/emoji-google/emoji_google.podspec b/emoji-google/emoji_google.podspec
diff --git a/emoji-ios/build.gradle b/emoji-ios/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
-  id("org.jetbrains.kotlin.native.cocoapods")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.parcelize")
   id("me.tylerbwong.gradle.metalava")

diff --git a/emoji-ios/emoji_ios.podspec b/emoji-ios/emoji_ios.podspec
diff --git a/emoji-material/build.gradle b/emoji-material/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
-  id("org.jetbrains.kotlin.native.cocoapods")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.parcelize")
   id("me.tylerbwong.gradle.metalava")

diff --git a/emoji-material/emoji_material.podspec b/emoji-material/emoji_material.podspec
diff --git a/emoji-twitter/build.gradle b/emoji-twitter/build.gradle
@@ -1,7 +1,6 @@
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
-  id("org.jetbrains.kotlin.native.cocoapods")
   id("com.android.library")
   id("org.jetbrains.kotlin.plugin.parcelize")
   id("me.tylerbwong.gradle.metalava")