diff --git a/emoji-facebook/build.gradle b/emoji-facebook/build.gradle
index fbc0445f42..e877cd4f57 100644
--- a/emoji-facebook/build.gradle
+++ b/emoji-facebook/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {
diff --git a/emoji-google-compat/build.gradle b/emoji-google-compat/build.gradle
index 1c78aef9f9..4be76cf27c 100644
--- a/emoji-google-compat/build.gradle
+++ b/emoji-google-compat/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {
diff --git a/emoji-google/build.gradle b/emoji-google/build.gradle
index c014362914..8a95052ae0 100644
--- a/emoji-google/build.gradle
+++ b/emoji-google/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {
diff --git a/emoji-ios/build.gradle b/emoji-ios/build.gradle
index 2a98a0c23a..fd35a5ef1d 100644
--- a/emoji-ios/build.gradle
+++ b/emoji-ios/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {
diff --git a/emoji-material/build.gradle b/emoji-material/build.gradle
index e1efc537e7..6190d2fdd7 100644
--- a/emoji-material/build.gradle
+++ b/emoji-material/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {
diff --git a/emoji-twitter/build.gradle b/emoji-twitter/build.gradle
index 72324e6985..f2b2dc35e4 100644
--- a/emoji-twitter/build.gradle
+++ b/emoji-twitter/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {
diff --git a/emoji/build.gradle b/emoji/build.gradle
index 0fd0bb8454..d860ccf63b 100644
--- a/emoji/build.gradle
+++ b/emoji/build.gradle
@@ -21,14 +21,14 @@ metalava {
 version = VERSION_NAME
 
 kotlin {
+  applyDefaultHierarchyTemplate()
+
   androidTarget("android") {
     publishLibraryVariants("release")
   }
 //  ios("ios")
-  jvm("jvm")
-  jvmToolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
-  }
+  jvm()
+  jvmToolchain(11)
 
   sourceSets {
     commonMain {