[Gradle] Add Gradle 7.4 variant

#KT-52490 In Progress

buildSrc/src/main/kotlin/GradleCommon.kt

@@ -48,6 +48,7 @@ enum class GradlePluginVariant(
     GRADLE_MIN("main", "6.7", "6.9"),
     GRADLE_70("gradle70", "7.0", "7.0"),
     GRADLE_71("gradle71", "7.1", "7.1"),
+    GRADLE_74("gradle74", "7.4", "7.4"),
     GRADLE_75("gradle75", "7.5", "7.5"),
     GRADLE_76("gradle76", "7.6", "7.6"),
 }

buildSrc/src/main/kotlin/gradle-plugin-common-configuration.gradle.kts

@@ -74,6 +74,13 @@ if (!kotlinBuildProperties.isInJpsBuildIdeaSync) {
     )
     publishShadowedJar(gradle71SourceSet, commonSourceSet)
 
+    // Used for Gradle 7.4+ versions
+    val gradle74SourceSet = createGradlePluginVariant(
+        GradlePluginVariant.GRADLE_74,
+        commonSourceSet = commonSourceSet
+    )
+    publishShadowedJar(gradle74SourceSet, commonSourceSet)
+
     // Used for Gradle 7.5+ versions
     val gradle75SourceSet = createGradlePluginVariant(
         GradlePluginVariant.GRADLE_75,

buildSrc/src/main/kotlin/gradle-plugin-dependency-configuration.gradle.kts

@@ -34,6 +34,13 @@ createGradlePluginVariant(
     isGradlePlugin = false
 )
 
+// Used for Gradle 7.4+ versions
+createGradlePluginVariant(
+    GradlePluginVariant.GRADLE_74,
+    commonSourceSet = commonSourceSet,
+    isGradlePlugin = false
+)
+
 // Used for Gradle 7.5+ versions
 createGradlePluginVariant(
     GradlePluginVariant.GRADLE_75,

gradle/verification-metadata.xml

@@ -1762,6 +1762,12 @@
             <sha256 value="2ba9bbd7869e40c3d81743a47d9667a0cf66830f11ac91148c70ad1491eb4ac0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="com.github.javaparser" name="javaparser-core" version="3.24.2">
+         <artifact name="javaparser-core-3.24.2.jar">
+            <md5 value="c3e5a909f3bae50880cea8fcd3869193" origin="Generated by Gradle"/>
+            <sha256 value="3c6adb7d16885462bed7b73d753a57000b82e09e364ff5623be0ed28d2fa766c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="com.github.kittinunf.fuel" name="fuel" version="2.3.1">
          <artifact name="fuel-2.3.1.jar">
             <md5 value="7c18f0d573486d36acc0597f6b3b3c88" origin="Generated by Gradle"/>
@@ -2910,6 +2916,12 @@
             <sha256 value="0b3e8478a8ed6bdb226941b313c1a06d50ef9d389d30cc82d7bc5985d94ed00f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="dev.gradleplugins" name="gradle-api" version="7.4">
+         <artifact name="gradle-api-7.4.jar">
+            <md5 value="54f06ceb86b0618b31cdc6b26b5a106d" origin="https://repo1.maven.org/maven2/dev/gradleplugins/gradle-api/7.4/gradle-api-7.4.jar.md5"/>
+            <sha256 value="46b102f93feb59a51219138a791eb0b764c04785bca24830a985b5b641acdde1" origin="https://repo1.maven.org/maven2/dev/gradleplugins/gradle-api/7.4/gradle-api-7.4.jar.sha256"/>
+         </artifact>
+      </component>
       <component group="dev.gradleplugins" name="gradle-api" version="7.5">
          <artifact name="gradle-api-7.5.jar">
             <md5 value="082f28c41dc57b8c6d7f8b633a401f48" origin="Generated by Gradle"/>
@@ -3056,6 +3068,12 @@
             <sha256 value="2a6e03310db149f8a11eb058aa78e775c229ef816333c9687379762d22833ad6" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="info.picocli" name="picocli" version="4.6.3">
+         <artifact name="picocli-4.6.3.jar">
+            <md5 value="773049ecb447f6bcbe806e3b50445fdf" origin="Generated by Gradle"/>
+            <sha256 value="b0a5159e926de8084ff066025142270443533656bc599b8bb31d14d11fd138a4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="io.grpc" name="grpc-api" version="1.21.1">
          <artifact name="grpc-api-1.21.1.jar">
             <md5 value="eebef16e9d36b3e78c3b1a0a09f82245" origin="Generated by Gradle"/>
@@ -5791,6 +5809,12 @@
             <sha256 value="fa498879e6f46c63d4c37341f6f539a9d0c5be1153b60eba75b4929263549b04" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy" version="3.0.9">
+         <artifact name="groovy-3.0.9.jar">
+            <md5 value="71a237cf62fae69018bd6a7e81036845" origin="Generated by Gradle"/>
+            <sha256 value="77bf86897f295f8cae2e1f46b1eca109f487ba81b66ef24a2b6dcba1eb7d6ce7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-all" version="2.4.12">
          <artifact name="groovy-all-2.4.12.jar">
             <md5 value="dddb0b3d3619875fa1c538c743ae8f99" origin="Generated by Gradle"/>
@@ -5803,6 +5827,12 @@
             <sha256 value="fb8283aaeb1981816dbb2e4c85d7da9f046a0b06b1623448d78ac4cb5a5584ed" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-ant" version="3.0.13">
+         <artifact name="groovy-ant-3.0.13.jar">
+            <md5 value="35b20c592e6548e0f421406088efbe68" origin="Generated by Gradle"/>
+            <sha256 value="6b98dcf1309448d48b5a9762e94073fbee17cc45ff2b91b3d74a34b4945517c7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-ant" version="3.0.8">
          <artifact name="groovy-ant-3.0.8.jar">
             <md5 value="06d07e7277dfa15590e3590d79423a00" origin="Generated by Gradle"/>
@@ -5815,6 +5845,12 @@
             <sha256 value="fd1f026a56979dfe0c02e81450d7d673822053b61231363c8b410ccf98ff430f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-astbuilder" version="3.0.13">
+         <artifact name="groovy-astbuilder-3.0.13.jar">
+            <md5 value="e263f21b4878eca91bbe8028a4f2fa5b" origin="Generated by Gradle"/>
+            <sha256 value="4b9291f2db479f9ea146f8ed6c977e7db9629fe0b78bc430c12b11a0e390ed50" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-astbuilder" version="3.0.8">
          <artifact name="groovy-astbuilder-3.0.8.jar">
             <md5 value="9c8dbfcbfed98548185cc75d35d09260" origin="Generated by Gradle"/>
@@ -5827,6 +5863,12 @@
             <sha256 value="40afff3dbd189cee496f2cdcc9d736da988cfc51eef3d49440c6fbd56ae44559" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-cli-picocli" version="3.0.13">
+         <artifact name="groovy-cli-picocli-3.0.13.jar">
+            <md5 value="6841c18d828ac400d8ee7d8e1f027513" origin="Generated by Gradle"/>
+            <sha256 value="d4fa7a8ac7a64f6d11ec6bdd02b242447d5c48c8d68228bb05c0f05e5c1a1ca1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-cli-picocli" version="3.0.8">
          <artifact name="groovy-cli-picocli-3.0.8.jar">
             <md5 value="48e080fd873e3ea27413154f5530bc55" origin="Generated by Gradle"/>
@@ -5839,6 +5881,12 @@
             <sha256 value="fd4d70c23e4d6da31642e91b0beac4be00193bf6f8b52087669a733d3dd90a62" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-console" version="3.0.13">
+         <artifact name="groovy-console-3.0.13.jar">
+            <md5 value="255a84327d61f7c3e23c578274cfb6e5" origin="Generated by Gradle"/>
+            <sha256 value="0a8f0977d17d18e220cfc91f23a5557d320a5abb7f8665db83db1f52a56075eb" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-console" version="3.0.8">
          <artifact name="groovy-console-3.0.8.jar">
             <md5 value="c47387f9f97d6541712cbbebb3ea4cd6" origin="Generated by Gradle"/>
@@ -5851,6 +5899,12 @@
             <sha256 value="a9149204e2eb7a35b465144bd5ab6d8d8e8071057f3d7e228f5cc1f8e42b54c7" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-datetime" version="3.0.13">
+         <artifact name="groovy-datetime-3.0.13.jar">
+            <md5 value="835d9d669214e02ca7ab830318b89575" origin="Generated by Gradle"/>
+            <sha256 value="e0af819c7fe96cbecbdb888fee8387b8131fa9adcc09afd0a94378134c106053" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-datetime" version="3.0.8">
          <artifact name="groovy-datetime-3.0.8.jar">
             <md5 value="3c4d6e546425d95e9a0d82163371998b" origin="Generated by Gradle"/>
@@ -5863,6 +5917,12 @@
             <sha256 value="04650c0c7a5b6b957f631d2706bbbb60d596f9c325faaa9dab5d5f4216bebb32" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-docgenerator" version="3.0.13">
+         <artifact name="groovy-docgenerator-3.0.13.jar">
+            <md5 value="6657936030ca1f89e8e49b618366e378" origin="Generated by Gradle"/>
+            <sha256 value="6779bfe520d68d92e30e5c74aec2e25491f145a5d2e2afe3991713b7aa79571d" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-docgenerator" version="3.0.8">
          <artifact name="groovy-docgenerator-3.0.8.jar">
             <md5 value="34340ce2619785ef830014af584d59ac" origin="Generated by Gradle"/>
@@ -5875,6 +5935,12 @@
             <sha256 value="8796f8d0e4ea3414936e29bdaa783df2224ef105bf5b71476db88d57bef92ad2" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-groovydoc" version="3.0.13">
+         <artifact name="groovy-groovydoc-3.0.13.jar">
+            <md5 value="322cb443ddc9578cab0e95110376ae5d" origin="Generated by Gradle"/>
+            <sha256 value="8a2e933ec156762d14b7354581981ae00d025d4f2fb72bd7599e030d5cb5e08c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-groovydoc" version="3.0.8">
          <artifact name="groovy-groovydoc-3.0.8.jar">
             <md5 value="8c2af9e4ba0f511d1026a2c9d1b1aa33" origin="Generated by Gradle"/>
@@ -5887,6 +5953,12 @@
             <sha256 value="d6e8fb19719f91eec539cae8cd5491997123bd81ddc69bba3aa9ba794bb22f54" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-groovysh" version="3.0.13">
+         <artifact name="groovy-groovysh-3.0.13.jar">
+            <md5 value="37c017daf4e76c578dda264ff3f8cf4a" origin="Generated by Gradle"/>
+            <sha256 value="6a6ae9b33d39a88ea3d2ccf482e661a044dd1dbb0f4705e8a764846068085d9c" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-groovysh" version="3.0.8">
          <artifact name="groovy-groovysh-3.0.8.jar">
             <md5 value="ab72377e1a5c302760107cf2f2bab052" origin="Generated by Gradle"/>
@@ -5899,6 +5971,12 @@
             <sha256 value="ea60d341bb9b5a733ca4a008c5d5d510996d05faaedd0a87ea705b60249d9b05" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-jmx" version="3.0.13">
+         <artifact name="groovy-jmx-3.0.13.jar">
+            <md5 value="68b715cee84dec6a04c0e58c46337a1b" origin="Generated by Gradle"/>
+            <sha256 value="10ab5469f5cec7066379d9925fcae8ad9405e1fe04727532078ce3a597154fd2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-jmx" version="3.0.8">
          <artifact name="groovy-jmx-3.0.8.jar">
             <md5 value="d88d85f420ba9869bb89609c581cdc03" origin="Generated by Gradle"/>
@@ -5911,6 +5989,12 @@
             <sha256 value="3d9ce94f81210fa36ffff93f32a0db08afed1e1a832b6d27f65e54a33d5417db" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-json" version="3.0.13">
+         <artifact name="groovy-json-3.0.13.jar">
+            <md5 value="07df3dfdcd0ca2ca2b52c8f69e8d38b0" origin="Generated by Gradle"/>
+            <sha256 value="921972defd8a89a5ab442f5ae57b1760755d7fe339dce46fe140e79a6e63e066" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-json" version="3.0.8">
          <artifact name="groovy-json-3.0.8.jar">
             <md5 value="ec723fd3359c5a4e6fb2af5528c8710b" origin="Generated by Gradle"/>
@@ -5923,6 +6007,12 @@
             <sha256 value="ae5cbdb3f1f0896242ea55a0e21b741ca8f6c2034177b69ae2493661fddbd54e" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-jsr223" version="3.0.13">
+         <artifact name="groovy-jsr223-3.0.13.jar">
+            <md5 value="d4f762c187eb7419a7a8ca733949bdef" origin="Generated by Gradle"/>
+            <sha256 value="d834f8d0e07fa73f5a59f700903180c1d834acde8ca03dd79641ef1460c82a4e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-jsr223" version="3.0.8">
          <artifact name="groovy-jsr223-3.0.8.jar">
             <md5 value="89d828f65941ebfa726947d8869a7935" origin="Generated by Gradle"/>
@@ -5935,6 +6025,12 @@
             <sha256 value="950a90c63d5dbb603c7ad65415c5f8771e719d2a47e32a61770df5ec43a2cd8c" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-macro" version="3.0.13">
+         <artifact name="groovy-macro-3.0.13.jar">
+            <md5 value="c943883aa7226d1eecff206d1c48dac2" origin="Generated by Gradle"/>
+            <sha256 value="cc4f1040ffad34f6019341193943d8ad3201a2c2fde510666de325148e6efc7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-macro" version="3.0.8">
          <artifact name="groovy-macro-3.0.8.jar">
             <md5 value="c28b6b36e78d3f2cccd4176217c8d219" origin="Generated by Gradle"/>
@@ -5947,6 +6043,12 @@
             <sha256 value="9067196b03198757e9be33724aac6a3ade76d3d09642b2523e400342498dc1f8" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-nio" version="3.0.13">
+         <artifact name="groovy-nio-3.0.13.jar">
+            <md5 value="ec5c5bd50d260638a286e23c56d1bfdb" origin="Generated by Gradle"/>
+            <sha256 value="87a8f0ad8022b5295e3292f2ffc65e6eb2f108da9f3648bc5eae873a0d54c9ad" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-nio" version="3.0.8">
          <artifact name="groovy-nio-3.0.8.jar">
             <md5 value="748a2321e921889013382920b704c91c" origin="Generated by Gradle"/>
@@ -5959,6 +6061,12 @@
             <sha256 value="a2dd1823a858e9a734c4ae825317826bddcad3c054841f05f174f6d6ec52c368" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-servlet" version="3.0.13">
+         <artifact name="groovy-servlet-3.0.13.jar">
+            <md5 value="2487c588135c0f7faea72852cffad9cd" origin="Generated by Gradle"/>
+            <sha256 value="b987ab4a4026cc2ecedf955dab9c03cd45bfb6ffeb1edb009164c9ef0f38a156" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-servlet" version="3.0.8">
          <artifact name="groovy-servlet-3.0.8.jar">
             <md5 value="0a97588424aea9afd95a01ec28cdbaeb" origin="Generated by Gradle"/>
@@ -5971,6 +6079,12 @@
             <sha256 value="00537a94fe0dd27e7635e6b0b181deea5ab8456d4afa75e018f91bf9e0c7897b" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-sql" version="3.0.13">
+         <artifact name="groovy-sql-3.0.13.jar">
+            <md5 value="d6abbb8e91b734cf58591e56f654fb7c" origin="Generated by Gradle"/>
+            <sha256 value="8fa0019578f22732bb49d4f923a46ad489d3dc1d03a28f5db57a8c92139ec8f2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-sql" version="3.0.8">
          <artifact name="groovy-sql-3.0.8.jar">
             <md5 value="9167c2310e30ece293a0aa6fe0879c95" origin="Generated by Gradle"/>
@@ -5983,6 +6097,12 @@
             <sha256 value="2967871373e22f590c98add03e75807b013b4fc9ab19bbe47ccf3093585dd9eb" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-swing" version="3.0.13">
+         <artifact name="groovy-swing-3.0.13.jar">
+            <md5 value="bdd570088baf329351e642dea3059a7f" origin="Generated by Gradle"/>
+            <sha256 value="ee10f03e6c8e5f6b3c674f206d3d8933712964b7fb1e14c5a6aec85ff25d57e4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-swing" version="3.0.8">
          <artifact name="groovy-swing-3.0.8.jar">
             <md5 value="8d2843892e796095ff4d12b400eb4f9c" origin="Generated by Gradle"/>
@@ -5995,6 +6115,12 @@
             <sha256 value="067ef3498ca568969917dc7badb99b62431685b7e71a0d3a64f07d503ea2efde" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-templates" version="3.0.13">
+         <artifact name="groovy-templates-3.0.13.jar">
+            <md5 value="3c29bdd5e3bc338f55bc9be3ba57ff94" origin="Generated by Gradle"/>
+            <sha256 value="abfb7190631a35fc96e023bfcd4658f3f7d4ae76c488ef1b972a54b29809ddc2" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-templates" version="3.0.8">
          <artifact name="groovy-templates-3.0.8.jar">
             <md5 value="7d1226bf74f783c980e0ed5652154193" origin="Generated by Gradle"/>
@@ -6007,6 +6133,12 @@
             <sha256 value="e2c5e963abef4e4a46859d0870daaec1e9b2c4cbd299ecd328a8e61573997b26" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-test" version="3.0.13">
+         <artifact name="groovy-test-3.0.13.jar">
+            <md5 value="5aad21f091426beb38da78332eb7c8bc" origin="Generated by Gradle"/>
+            <sha256 value="bd6a2fd5d870e8a37949ae7109f1c838873ce4f3f72762b9200e448426b985d1" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-test" version="3.0.8">
          <artifact name="groovy-test-3.0.8.jar">
             <md5 value="42693079c79da133d480e3552a0b2a01" origin="Generated by Gradle"/>
@@ -6019,6 +6151,12 @@
             <sha256 value="20c36ca85b4c3fa1b152b08349ed3cf4b1aef093681911af7ffdd84e16cdf3c0" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-test-junit5" version="3.0.13">
+         <artifact name="groovy-test-junit5-3.0.13.jar">
+            <md5 value="e0f071d3c1cc4853dec51f67f2de135d" origin="Generated by Gradle"/>
+            <sha256 value="be29cc480cec23d5082fabc2d29d2152d3f5be582b31c8ea848d3999dd5b1496" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-test-junit5" version="3.0.8">
          <artifact name="groovy-test-junit5-3.0.8.jar">
             <md5 value="c5c0dd43649b4fec61085f5154cabdf2" origin="Generated by Gradle"/>
@@ -6031,6 +6169,12 @@
             <sha256 value="0f633ef91119a48dcdc9995f41ee5eb8fa7feb334da6370cc53998a5627b53ee" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-testng" version="3.0.13">
+         <artifact name="groovy-testng-3.0.13.jar">
+            <md5 value="2ded8d808adbe72a424b7dc1439894ed" origin="Generated by Gradle"/>
+            <sha256 value="361edff0cb61a968346849bc51a20f238998b17c24dad21389143fbcf3bc3c7e" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-testng" version="3.0.8">
          <artifact name="groovy-testng-3.0.8.jar">
             <md5 value="b9501ad0665012c655aa1cfb15327bc0" origin="Generated by Gradle"/>
@@ -6049,6 +6193,12 @@
             <sha256 value="bc2ad5113596a3a9bb650da6471f1b891505421782174a7fe60d790edb629e85" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.codehaus.groovy" name="groovy-xml" version="3.0.13">
+         <artifact name="groovy-xml-3.0.13.jar">
+            <md5 value="470891e51d854f73a3ac8b10850cf506" origin="Generated by Gradle"/>
+            <sha256 value="8faea983f0d871bd2d2f28150747edf9047dd4d716700a0276eaa905a5cd0816" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.codehaus.groovy" name="groovy-xml" version="3.0.8">
          <artifact name="groovy-xml-3.0.8.jar">
             <md5 value="072f5b640272f58d7e038ccc4e01aeb8" origin="Generated by Gradle"/>
@@ -6991,6 +7141,12 @@
             <sha256 value="aa88e9625577957f3249a46cb6e166ee09b369e600f7a11d148d16b0a6d87f05" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib" version="1.7.10">
+         <artifact name="kotlin-stdlib-1.7.10.jar">
+            <md5 value="c0d54ffa8ca9eeb13d6e81639ff87096" origin="Generated by Gradle"/>
+            <sha256 value="e771fe74250a943e8f6346713201ff1d8cb95c3a5d1a91a22b65a9e04f6a8901" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.3.70">
          <artifact name="kotlin-stdlib-common-1.3.70.jar">
             <md5 value="53323436def4746efd414192e1add1bc" origin="Generated by Gradle"/>
@@ -7083,6 +7239,12 @@
             <sha256 value="59c6ff64fe9a6604afce03e8aaa75f83586c6030ac71fb0b34ee7cdefed3618f" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="org.jetbrains.kotlin" name="kotlin-stdlib-common" version="1.7.10">
+         <artifact name="kotlin-stdlib-common-1.7.10.jar">
+            <md5 value="e2fbf05c93d846bbe26655d6d6d2e137" origin="Generated by Gradle"/>
+            <sha256 value="19f102efe9629f8eabc63853ad15c533e47c47f91fca09285c5bde86e59f91d4" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.3.31">
          <artifact name="kotlin-stdlib-jdk7-1.3.31.jar">
             <md5 value="2ccfa99735888fb60053f3c7f07243f0" origin="Generated by Gradle"/>

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt

@@ -216,7 +216,7 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
 
     @DisplayName("Proper Gradle plugin variant is used")
     @GradleTestVersions(
-        additionalVersions = [TestVersions.Gradle.G_7_0, TestVersions.Gradle.G_7_1, TestVersions.Gradle.G_7_4, TestVersions.Gradle.G_7_5],
+        additionalVersions = [TestVersions.Gradle.G_7_0, TestVersions.Gradle.G_7_1, TestVersions.Gradle.G_7_3, TestVersions.Gradle.G_7_4, TestVersions.Gradle.G_7_5],
         maxVersion = TestVersions.Gradle.G_7_6
     )
     @GradleTest
@@ -226,7 +226,8 @@ class SimpleKotlinGradleIT : KGPBaseTest() {
                 val expectedVariant = when (gradleVersion) {
                     GradleVersion.version(TestVersions.Gradle.G_7_6) -> "gradle76"
                     GradleVersion.version(TestVersions.Gradle.G_7_5) -> "gradle75"
-                    in GradleVersion.version(TestVersions.Gradle.G_7_1)..GradleVersion.version(TestVersions.Gradle.G_7_4) -> "gradle71"
+                    GradleVersion.version(TestVersions.Gradle.G_7_4) -> "gradle74"
+                    in GradleVersion.version(TestVersions.Gradle.G_7_1)..GradleVersion.version(TestVersions.Gradle.G_7_3) -> "gradle71"
                     GradleVersion.version(TestVersions.Gradle.G_7_0) -> "gradle70"
                     else -> "main"
                 }

libraries/tools/kotlin-gradle-plugin/src/gradle74/kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt

@@ -0,0 +1,145 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.plugin
+
+import com.android.build.gradle.BaseExtension
+import org.gradle.api.Named
+import org.gradle.api.NamedDomainObjectContainer
+import org.gradle.api.Project
+import org.gradle.api.file.SourceDirectorySet
+import org.gradle.api.model.ObjectFactory
+import org.gradle.tooling.provider.model.ToolingModelBuilderRegistry
+import org.jetbrains.kotlin.gradle.plugin.internal.*
+import javax.inject.Inject
+
+private const val PLUGIN_VARIANT_NAME = "gradle74"
+
+open class KotlinPluginWrapper @Inject constructor(
+    registry: ToolingModelBuilderRegistry
+) : AbstractKotlinPluginWrapper(registry) {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+open class KotlinCommonPluginWrapper @Inject constructor(
+    registry: ToolingModelBuilderRegistry
+) : AbstractKotlinCommonPluginWrapper(registry) {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+open class KotlinAndroidPluginWrapper @Inject constructor(
+    registry: ToolingModelBuilderRegistry
+) : AbstractKotlinAndroidPluginWrapper(registry) {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+@Suppress("DEPRECATION_ERROR")
+open class Kotlin2JsPluginWrapper @Inject constructor(
+    registry: ToolingModelBuilderRegistry
+) : AbstractKotlin2JsPluginWrapper(registry) {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+open class KotlinMultiplatformPluginWrapper : AbstractKotlinMultiplatformPluginWrapper() {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+open class KotlinJsPluginWrapper : AbstractKotlinJsPluginWrapper() {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+open class KotlinPm20PluginWrapper @Inject constructor(
+    objectFactory: ObjectFactory
+) : AbstractKotlinPm20PluginWrapper(objectFactory) {
+
+    override val pluginVariant: String = PLUGIN_VARIANT_NAME
+
+    override fun apply(project: Project) {
+        project.registerVariantImplementations()
+        super.apply(project)
+    }
+}
+
+open class KotlinPlatformJvmPlugin : KotlinPlatformImplementationPluginBase("jvm") {
+    override fun apply(project: Project) {
+        project.applyPlugin<KotlinPluginWrapper>()
+        super.apply(project)
+    }
+}
+
+open class KotlinPlatformJsPlugin : KotlinPlatformImplementationPluginBase("js") {
+    override fun apply(project: Project) {
+        @Suppress("DEPRECATION_ERROR")
+        project.applyPlugin<Kotlin2JsPluginWrapper>()
+        super.apply(project)
+    }
+}
+
+open class KotlinPlatformAndroidPlugin : KotlinPlatformImplementationPluginBase("android") {
+    override fun apply(project: Project) {
+        project.applyPlugin<KotlinAndroidPluginWrapper>()
+        super.apply(project)
+    }
+
+    override fun namedSourceSetsContainer(project: Project): NamedDomainObjectContainer<*> =
+        (project.extensions.getByName("android") as BaseExtension).sourceSets
+
+    override fun addCommonSourceSetToPlatformSourceSet(commonSourceSet: Named, platformProject: Project) {
+        val androidExtension = platformProject.extensions.getByName("android") as BaseExtension
+        val androidSourceSet = androidExtension.sourceSets.findByName(commonSourceSet.name) ?: return
+        val kotlinSourceSet = androidSourceSet.getExtension<SourceDirectorySet>(KOTLIN_DSL_NAME)
+            ?: return
+        kotlinSourceSet.source(getKotlinSourceDirectorySetSafe(commonSourceSet)!!)
+    }
+}
+
+open class KotlinPlatformCommonPlugin : KotlinPlatformPluginBase("common") {
+    override fun apply(project: Project) {
+        warnAboutKotlin12xMppDeprecation(project)
+        project.applyPlugin<KotlinCommonPluginWrapper>()
+    }
+}
+
+private fun Project.registerVariantImplementations() {
+    val factories = VariantImplementationFactories.get(gradle)
+    factories[MppTestReportHelper.MppTestReportHelperVariantFactory::class] =
+        MppTestReportHelperG74.MppTestReportHelperVariantFactoryG74()
+}

libraries/tools/kotlin-gradle-plugin/src/gradle74/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/MppTestReportHelperG74.kt

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.gradle.plugin.internal
+
+import org.gradle.api.internal.tasks.testing.TestDescriptorInternal
+import org.gradle.api.internal.tasks.testing.TestResultProcessor
+import org.gradle.api.internal.tasks.testing.TestStartEvent
+import org.jetbrains.kotlin.gradle.testing.KotlinTestFailure
+
+internal class MppTestReportHelperG74 : MppTestReportHelper {
+    internal class MppTestReportHelperVariantFactoryG74 :
+        MppTestReportHelper.MppTestReportHelperVariantFactory {
+        override fun getInstance(): MppTestReportHelper = MppTestReportHelperG74()
+    }
+
+    override fun reportFailure(
+        results: TestResultProcessor,
+        id: Any,
+        failure: KotlinTestFailure,
+        isAssertionFailure: Boolean,
+    ) {
+        results.failure(
+            id,
+            failure,
+        )
+    }
+
+    @Suppress("DuplicatedCode") // the delegating processor implements different interfaces with the same code
+    override fun createDelegatingTestReportProcessor(origin: TestResultProcessor, targetName: String) =
+        object : TestResultProcessor by origin {
+            override fun started(test: TestDescriptorInternal, event: TestStartEvent) {
+                val myTest = object : TestDescriptorInternal by test {
+                    override fun getDisplayName(): String = "${test.displayName}[$targetName]"
+                    override fun getClassName(): String? = test.className?.replace('$', '.')
+                    override fun getClassDisplayName(): String? = test.classDisplayName?.replace('$', '.')
+                }
+                origin.started(myTest, event)
+            }
+        }
+}