diff --git a/emoji-androidx-emoji2/api/current.txt b/emoji-androidx-emoji2/api/current.txt
index d5e383a05b..e7e4cb4222 100644
--- a/emoji-androidx-emoji2/api/current.txt
+++ b/emoji-androidx-emoji2/api/current.txt
@@ -3,19 +3,26 @@ package com.vanniktech.emoji.androidxemoji2 {
 
   public final class AndroidxEmoji2Provider implements com.vanniktech.emoji.EmojiAndroidProvider com.vanniktech.emoji.EmojiProvider com.vanniktech.emoji.EmojiReplacer {
     ctor public AndroidxEmoji2Provider(androidx.emoji2.text.EmojiCompat emojiCompat);
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public android.graphics.drawable.Drawable getDrawable(com.vanniktech.emoji.Emoji emoji, android.content.Context context);
     method public int getIcon(com.vanniktech.emoji.EmojiCategory emojiCategory);
     method public void release();
     method public void replaceWithImages(android.content.Context context, android.text.Spannable text, float emojiSize, com.vanniktech.emoji.EmojiReplacer? fallback);
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class AndroidxEmoji2Provider implements com.vanniktech.emoji.EmojiProvider {
     ctor public AndroidxEmoji2Provider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
+  }
+
+  public final class AndroidxEmoji2Provider implements com.vanniktech.emoji.EmojiProvider {
+    ctor public AndroidxEmoji2Provider();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
+    method public void release();
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
 }
diff --git a/emoji-androidx-emoji2/build.gradle.kts b/emoji-androidx-emoji2/build.gradle.kts
index d1bbe464c4..3218d38c12 100644
--- a/emoji-androidx-emoji2/build.gradle.kts
+++ b/emoji-androidx-emoji2/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain", "src/jvmMain")
 }
 
 kotlin {
@@ -72,7 +69,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/emoji-facebook/api/current.txt b/emoji-facebook/api/current.txt
index 6d92224474..47e574fdd0 100644
--- a/emoji-facebook/api/current.txt
+++ b/emoji-facebook/api/current.txt
@@ -3,25 +3,25 @@ package com.vanniktech.emoji.facebook {
 
   public final class FacebookEmojiProvider implements com.vanniktech.emoji.EmojiAndroidProvider com.vanniktech.emoji.EmojiProvider {
     ctor public FacebookEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public android.graphics.drawable.Drawable getDrawable(com.vanniktech.emoji.Emoji emoji, android.content.Context context);
     method public int getIcon(com.vanniktech.emoji.EmojiCategory emojiCategory);
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class FacebookEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public FacebookEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class FacebookEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public FacebookEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
 }
diff --git a/emoji-facebook/build.gradle.kts b/emoji-facebook/build.gradle.kts
index faf616b47c..0f20e09d96 100644
--- a/emoji-facebook/build.gradle.kts
+++ b/emoji-facebook/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain", "src/jvmMain", "src/iosMain")
 }
 
 kotlin {
@@ -66,7 +63,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/emoji-google-compat/api/current.txt b/emoji-google-compat/api/current.txt
index 28bac8090d..009aa72558 100644
--- a/emoji-google-compat/api/current.txt
+++ b/emoji-google-compat/api/current.txt
@@ -3,19 +3,26 @@ package com.vanniktech.emoji.googlecompat {
 
   public final class GoogleCompatEmojiProvider implements com.vanniktech.emoji.EmojiAndroidProvider com.vanniktech.emoji.EmojiProvider com.vanniktech.emoji.EmojiReplacer {
     ctor public GoogleCompatEmojiProvider(androidx.emoji.text.EmojiCompat emojiCompat);
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public android.graphics.drawable.Drawable getDrawable(com.vanniktech.emoji.Emoji emoji, android.content.Context context);
     method public int getIcon(com.vanniktech.emoji.EmojiCategory emojiCategory);
     method public void release();
     method public void replaceWithImages(android.content.Context context, android.text.Spannable text, float emojiSize, com.vanniktech.emoji.EmojiReplacer? fallback);
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class GoogleCompatEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public GoogleCompatEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
+  }
+
+  public final class GoogleCompatEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
+    ctor public GoogleCompatEmojiProvider();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
+    method public void release();
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
 }
diff --git a/emoji-google-compat/build.gradle.kts b/emoji-google-compat/build.gradle.kts
index 578ccb0c76..c8adaa5216 100644
--- a/emoji-google-compat/build.gradle.kts
+++ b/emoji-google-compat/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain", "src/jvmMain")
 }
 
 kotlin {
@@ -72,7 +69,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/emoji-google/api/current.txt b/emoji-google/api/current.txt
index eb332017d7..65162628b2 100644
--- a/emoji-google/api/current.txt
+++ b/emoji-google/api/current.txt
@@ -3,25 +3,25 @@ package com.vanniktech.emoji.google {
 
   public final class GoogleEmojiProvider implements com.vanniktech.emoji.EmojiAndroidProvider com.vanniktech.emoji.EmojiProvider {
     ctor public GoogleEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public android.graphics.drawable.Drawable getDrawable(com.vanniktech.emoji.Emoji emoji, android.content.Context context);
     method public int getIcon(com.vanniktech.emoji.EmojiCategory emojiCategory);
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class GoogleEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public GoogleEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class GoogleEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public GoogleEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
 }
diff --git a/emoji-google/build.gradle.kts b/emoji-google/build.gradle.kts
index 51a932f56e..8ad86dfa04 100644
--- a/emoji-google/build.gradle.kts
+++ b/emoji-google/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain", "src/jvmMain", "src/iosMain")
 }
 
 kotlin {
@@ -66,7 +63,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/emoji-ios/api/current.txt b/emoji-ios/api/current.txt
index 264fd46aa9..37403d26cf 100644
--- a/emoji-ios/api/current.txt
+++ b/emoji-ios/api/current.txt
@@ -3,25 +3,25 @@ package com.vanniktech.emoji.ios {
 
   public final class IosEmojiProvider implements com.vanniktech.emoji.EmojiAndroidProvider com.vanniktech.emoji.EmojiProvider {
     ctor public IosEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public android.graphics.drawable.Drawable getDrawable(com.vanniktech.emoji.Emoji emoji, android.content.Context context);
     method public int getIcon(com.vanniktech.emoji.EmojiCategory emojiCategory);
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class IosEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public IosEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class IosEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public IosEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
 }
diff --git a/emoji-ios/build.gradle.kts b/emoji-ios/build.gradle.kts
index 3fcccd52c5..0a3dd9f314 100644
--- a/emoji-ios/build.gradle.kts
+++ b/emoji-ios/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain", "src/jvmMain", "src/iosMain")
 }
 
 kotlin {
@@ -66,7 +63,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/emoji-material/build.gradle.kts b/emoji-material/build.gradle.kts
index 509576087f..60d094fd8e 100644
--- a/emoji-material/build.gradle.kts
+++ b/emoji-material/build.gradle.kts
@@ -14,7 +14,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/androidMain")
 }
 
 kotlin {
diff --git a/emoji-twitter/api/current.txt b/emoji-twitter/api/current.txt
index 544864b8e3..b607ab37c0 100644
--- a/emoji-twitter/api/current.txt
+++ b/emoji-twitter/api/current.txt
@@ -3,25 +3,25 @@ package com.vanniktech.emoji.twitter {
 
   public final class TwitterEmojiProvider implements com.vanniktech.emoji.EmojiAndroidProvider com.vanniktech.emoji.EmojiProvider {
     ctor public TwitterEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public android.graphics.drawable.Drawable getDrawable(com.vanniktech.emoji.Emoji emoji, android.content.Context context);
     method public int getIcon(com.vanniktech.emoji.EmojiCategory emojiCategory);
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class TwitterEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public TwitterEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class TwitterEmojiProvider implements com.vanniktech.emoji.EmojiProvider {
     ctor public TwitterEmojiProvider();
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public com.vanniktech.emoji.EmojiCategory![] categories;
+    property public com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
 }
diff --git a/emoji-twitter/build.gradle.kts b/emoji-twitter/build.gradle.kts
index f8dab1dbde..f987bab1f8 100644
--- a/emoji-twitter/build.gradle.kts
+++ b/emoji-twitter/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain", "src/jvmMain", "src/iosMain")
 }
 
 kotlin {
@@ -66,7 +63,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/emoji/api/current.txt b/emoji/api/current.txt
index 623bf2dc1f..c0875a58f0 100644
--- a/emoji/api/current.txt
+++ b/emoji/api/current.txt
@@ -142,9 +142,9 @@ package com.vanniktech.emoji {
   }
 
   public interface EmojiProvider {
-    method public com.vanniktech.emoji.EmojiCategory![] getCategories();
+    method public com.vanniktech.emoji.EmojiCategory[] getCategories();
     method public void release();
-    property public abstract com.vanniktech.emoji.EmojiCategory![] categories;
+    property public abstract com.vanniktech.emoji.EmojiCategory[] categories;
   }
 
   public final class EmojiRange {
diff --git a/emoji/build.gradle.kts b/emoji/build.gradle.kts
index 636c4e1179..62db2d3415 100644
--- a/emoji/build.gradle.kts
+++ b/emoji/build.gradle.kts
@@ -1,5 +1,3 @@
-import org.jetbrains.kotlin.gradle.plugin.mpp.BitcodeEmbeddingMode
-
 plugins {
   id("org.jetbrains.dokka")
   id("org.jetbrains.kotlin.multiplatform")
@@ -17,7 +15,6 @@ licensee {
 
 metalava {
   filename.set("api/current.txt")
-  sourcePaths.setFrom("src/commonMain", "src/androidMain")
 }
 
 kotlin {
@@ -75,7 +72,6 @@ kotlin {
 
     framework {
       isStatic = true
-      embedBitcode(if ("YES" == System.getenv("ENABLE_BITCODE")) BitcodeEmbeddingMode.BITCODE else BitcodeEmbeddingMode.DISABLE)
     }
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e630e34442..1aedab3d69 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -28,7 +28,7 @@ plugin-androidgradleplugin = { module = "com.android.tools.build:gradle", versio
 plugin-dokka = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version = "1.9.20" }
 plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
 plugin-licensee = { module = "app.cash.licensee:licensee-gradle-plugin", version = "1.12.0" }
-plugin-metalava = { module = "me.tylerbwong.gradle.metalava:plugin", version = "0.3.5" }
+plugin-metalava = { module = "me.tylerbwong.gradle.metalava:plugin", version = "0.4.0-alpha02" }
 plugin-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version = "0.30.0" }
 robolectric = { module = "org.robolectric:robolectric", version = "4.14.1" }
 screengrab = { module = "tools.fastlane:screengrab", version = "2.1.1" }