azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Gradle] Bump minimal supported AGP version to 7.1.3

Browse Source 
^KT-62939 Fixed
This commit is contained in:
Yahor Berdnikau
2023-11-11 13:23:47 +01:00
committed by Space Team
parent f4d088a886
commit 6eca282e9a
27 changed files with 189 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gradle/libs.versions.toml
+8
View File
@@ -22,6 +22,8 @@ jgit = "6.6.0.202305301015-r"
junit4 = "4.13.2"
junit5 = "5.10.0"
junit-platform = "1.10.0"
android-gradle-plugin = "7.1.3"
android-tools = "30.3.1"
[libraries]
dexMemberList = { module = "com.jakewharton.dex:dex-member-list", version.ref = "dexMemberList" }
@@ -64,5 +66,11 @@ junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher
junit-platform-runner = { module = "org.junit.platform:junit-platform-runner", version.ref = "junit-platform" }
junit-platform-suite-api = { module = "org.junit.platform:junit-platform-suite-api", version.ref = "junit-platform" }
android-gradle-plugin-gradle-api = { module = "com.android.tools.build:gradle-api", version.ref = "android-gradle-plugin" }
android-gradle-plugin-gradle = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
android-gradle-plugin-builder = { module = "com.android.tools.build:builder", version.ref = "android-gradle-plugin" }
android-gradle-plugin-builder-model = { module = "com.android.tools.build:builder-model", version.ref = "android-gradle-plugin" }
android-tools-common = { module = "com.android.tools:common", version.ref = "android-tools" }
[plugins]
jetbrains-ideaExt = { id = "org.jetbrains.gradle.plugin.idea-ext", version.ref = "jetbrains-ideaExt" }
gradle/verification-metadata.xml
+28 -166
View File
@@ -136,24 +136,12 @@
<sha256 value="9e1d8dd83ca6003f841e3af878ce2dc7c22497493a7bb6d1b62ec1b0d0a83c05" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="signflinger" version="4.2.2">
<artifact name="signflinger-4.2.2.jar">
<md5 value="f443c524196ff286915a687159b824aa" origin="Generated by Gradle"/>
<sha256 value="4d7aafd9666707b483b1ad2c466824287cf2e379dda1d204dd3b7e453ffcf760" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="signflinger" version="7.4.2">
<artifact name="signflinger-7.4.2.jar">
<md5 value="68601d4b3be8c2073756ec1629f46f9e" origin="Generated by Gradle"/>
<sha256 value="1f25f3f9c5d706fd7bc133a45bf35511093197d540635a613d1aae11260e314a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="zipflinger" version="4.2.2">
<artifact name="zipflinger-4.2.2.jar">
<md5 value="a46c609944804bad882613a121281a1b" origin="Generated by Gradle"/>
<sha256 value="8e4677086c9a8f4a67374a4edc31db7e481f0d9b85907263c51ca72452c23a93" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android" name="zipflinger" version="7.2.1">
<artifact name="zipflinger-7.2.1.jar">
<md5 value="517551a4f3af0f039e80ba4e5c6012f6" origin="Generated by Gradle"/>
@@ -172,48 +160,42 @@
<sha256 value="530b2113317ff4d0f69ffdfb49387ba4b86aac169e1c77dff943405b79adcf8b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="annotations" version="27.2.2">
<artifact name="annotations-27.2.2.jar">
<md5 value="00bb16d0300c1408c14a6e30373aca3e" origin="Generated by Gradle"/>
<sha256 value="9375fb2df5c0cf1b46fef9e65b3a27ac88925ccf90054b19ae0ca0adc7036fe1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="annotations" version="30.2.1">
<artifact name="annotations-30.2.1.jar">
<md5 value="27911c07842776aa41b6a9f59ec20b3a" origin="Generated by Gradle"/>
<sha256 value="630ab4c6f211fa1c0f5c884152cb6311360f1b796442196c287a658645a99645" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="annotations" version="30.3.1">
<artifact name="annotations-30.3.1.jar">
<md5 value="ac15ba4f7821b762d2ea7bd6d48e59bb" origin="Generated by Gradle"/>
<sha256 value="77e5196bcafc283c5e987f0944f049eee0e68b532ebeb530d855f6f196db4f2a" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="annotations" version="30.4.2">
<artifact name="annotations-30.4.2.jar">
<md5 value="14a26596a55775b554c8b38c4873e83d" origin="Generated by Gradle"/>
<sha256 value="d4ba7dd6055a6f1fd6ddb6dcef4e2096c15908bc7dc6057cb2e06f3a0db949c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="common" version="27.2.2">
<artifact name="common-27.2.2.jar">
<md5 value="4bc544ee45945a16e7089a34dd307a49" origin="Generated by Gradle"/>
<sha256 value="a76f4e10cad39bed317be031fee915d280aa8bc11616c58ab94e051b1e38769d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="common" version="30.2.1">
<artifact name="common-30.2.1.jar">
<md5 value="897c0c06b5c5dd1456ec4c4744e3b147" origin="Generated by Gradle"/>
<sha256 value="0f1d541e4b7114948023745e971c64e10f7dcc7dcf79f4d3017202c517177649" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="common" version="30.3.1">
<artifact name="common-30.3.1.jar">
<md5 value="dae5ec0e4cd9d7daceae09406eaa03c0" origin="Generated by Gradle"/>
<sha256 value="559f1484222d8947ecf4d18538295be6d12ff2b74dc22c3c85922c7ba33678e9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="common" version="30.4.2">
<artifact name="common-30.4.2.jar">
<md5 value="2f356b725588bbb247fd6f697fef4e91" origin="Generated by Gradle"/>
<sha256 value="1adc8a7156526618fe2d3243067a1d61c90c43f6b52515edaafe862bfb156f28" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="dvlib" version="27.2.2">
<artifact name="dvlib-27.2.2.jar">
<md5 value="e28e8304b92e0a4bc8137c5f29e47043" origin="Generated by Gradle"/>
<sha256 value="9931c6b57460b5f8cc2613ca5ff8596aa089a67655ace13d173f90538ecb4301" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="dvlib" version="30.4.2">
<artifact name="dvlib-30.4.2.jar">
<md5 value="a8421dd90891f51c43ff57e2a61e17d1" origin="Generated by Gradle"/>
@@ -232,36 +214,18 @@
<sha256 value="5665e292c435ada26c1afde71f4d893303594c6e35648039f7c3fa31d9ecdff5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="repository" version="27.2.2">
<artifact name="repository-27.2.2.jar">
<md5 value="533feaed16b46eca8344f57ae7c9e421" origin="Generated by Gradle"/>
<sha256 value="ac5f9b19dc5d9d08e80b57da76059f5760ca76c221e40ffd4bf43d7b13991674" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="repository" version="30.4.2">
<artifact name="repository-30.4.2.jar">
<md5 value="27b6c35f119cff6ff34098b84506ef6e" origin="Generated by Gradle"/>
<sha256 value="6c39549d1887a2c7e08b73d66c0c4f103657b06471760fb65858c943756cc940" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdk-common" version="27.2.2">
<artifact name="sdk-common-27.2.2.jar">
<md5 value="99aa3c0eece40e045170f98379f2c54c" origin="Generated by Gradle"/>
<sha256 value="b147acc13850808d61fc391ccfeeebdf90841b461a7042acb2d92e466da8e674" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdk-common" version="30.4.2">
<artifact name="sdk-common-30.4.2.jar">
<md5 value="179f45044a8aee218877c03e26e77a6e" origin="Generated by Gradle"/>
<sha256 value="3c5517b9a65fd33c2a1caeab787306d4e3bb233713e7bb47bacddcd84db2ea0d" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdklib" version="27.2.2">
<artifact name="sdklib-27.2.2.jar">
<md5 value="7c33ede70eab4c0d9a550c41104f5a37" origin="Generated by Gradle"/>
<sha256 value="fae0bafbe8b4f546cf64986a22b7d8ed108d45519366ff22f0170a9cf3ea7f34" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools" name="sdklib" version="30.4.2">
<artifact name="sdklib-30.4.2.jar">
<md5 value="d061a1d3d56b943b3c13a7c3469fb060" origin="Generated by Gradle"/>
@@ -304,12 +268,6 @@
<sha256 value="97c71d265d23e0b02a1d08768eee3aa9e7a0084ff5d0b688019ec8b4b56595c5" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apksig" version="4.2.2">
<artifact name="apksig-4.2.2.jar">
<md5 value="8741c22545d4f4f4c331abd0e821dd52" origin="Generated by Gradle"/>
<sha256 value="632690bf641b429dcb31650e6b2f6a2e87c4ac8afd45a6ba3cbc99fb1612178f" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apksig" version="7.2.1">
<artifact name="apksig-7.2.1.jar">
<md5 value="22a1d74d318bb908800d2e6e70c4228c" origin="Generated by Gradle"/>
@@ -322,12 +280,6 @@
<sha256 value="6d6a13a51ac3806c11af5f0967092055e35a67df6a74bff1544d9f5518c5ad55" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apkzlib" version="4.2.2">
<artifact name="apkzlib-4.2.2.jar">
<md5 value="c6255f9c7ab7c62554e5416c7e5daef8" origin="Generated by Gradle"/>
<sha256 value="3b5167c1265e97f65201c4d2be6a6f72165a3aa2fe9e0594a59b67af9e9e97b9" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="apkzlib" version="7.2.1">
<artifact name="apkzlib-7.2.1.jar">
<md5 value="d8c2ed23968302de0ee8a796942e2c6c" origin="Generated by Gradle"/>
@@ -346,10 +298,10 @@
<sha256 value="789d9122cd19ef894d03f5ebb890a4b878984dc7f39cb9d0828d328cc564aeb6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder" version="4.2.2">
<artifact name="builder-4.2.2.jar">
<md5 value="0b06f4974d63d67407fee253a7e463cd" origin="Generated by Gradle"/>
<sha256 value="40fedd0d16db8f34ddb4eaf812d966b90ef1764f65cf119030442823bcf995cd" origin="Generated by Gradle"/>
<component group="com.android.tools.build" name="builder" version="7.1.3">
<artifact name="builder-7.1.3.jar">
<md5 value="6a4f4a8a85f609183b471646898fc499" origin="Generated by Gradle"/>
<sha256 value="4b33ed3941563ffc67f8aeedc480aafd958ec6cd1fe661f0b2b5b0d9c1423649" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder" version="7.2.1">
@@ -370,10 +322,10 @@
<sha256 value="612358ba74f897ec8a18ed1b08da91b5deeb2e9cf62974e6e72f0e7a06405561" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder-model" version="4.2.2">
<artifact name="builder-model-4.2.2.jar">
<md5 value="97f0dc1982ff3517a1041d4817a7f574" origin="Generated by Gradle"/>
<sha256 value="41868de0cb88ae70b828eee4191c13e0233f433abb1becdf6a2bd391bd446bc0" origin="Generated by Gradle"/>
<component group="com.android.tools.build" name="builder-model" version="7.1.3">
<artifact name="builder-model-7.1.3.jar">
<md5 value="641a93b60f6bdf6ee0fcc5fef0dc0cd3" origin="Generated by Gradle"/>
<sha256 value="232604983a99b8372eb1a93e5183d48fc8fc69239e5e6229170be0e3320df430" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="builder-model" version="7.2.1">
@@ -406,10 +358,10 @@
<sha256 value="5f89cec23f49d8cd1e94613e8f7990aac13a2099d5089eabb8a0672d828a6889" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle" version="4.2.2">
<artifact name="gradle-4.2.2.jar">
<md5 value="87c343b2d607b79b35a19f5b5cad4571" origin="Generated by Gradle"/>
<sha256 value="6877441af1ad27acb2f68613dae556d9620ef7a5705d73b1412a49755038b3e6" origin="Generated by Gradle"/>
<component group="com.android.tools.build" name="gradle" version="7.1.3">
<artifact name="gradle-7.1.3.jar">
<md5 value="b339d8c3364dc496e1135ef642130928" origin="Generated by Gradle"/>
<sha256 value="4b9673197827a725f7ca3d7c86b91e35ca23969a13ea2d5a0f05ad7d2b337a58" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle" version="7.2.1">
@@ -424,10 +376,10 @@
<sha256 value="d426478af963bd2276feb840fc97b8590edb1392670f587e838fd63f829fbd24" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle-api" version="4.2.2">
<artifact name="gradle-api-4.2.2.jar">
<md5 value="beab0b1a3232aa1243fb76db3286f50e" origin="Generated by Gradle"/>
<sha256 value="dd4ef35bbbfb8fc2d20e3311c76b516bc1672e82b61cb3a59fc877da0f9b4f61" origin="Generated by Gradle"/>
<component group="com.android.tools.build" name="gradle-api" version="7.1.3">
<artifact name="gradle-api-7.1.3.jar">
<md5 value="6ecf3b36308d24af15c02d1f0008d835" origin="Generated by Gradle"/>
<sha256 value="483726f1f0bd2b07b521de32cacc22954b9490ebc158efca59a7c8ddee4d0331" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="gradle-api" version="7.2.1">
@@ -448,12 +400,6 @@
<sha256 value="02608b8ea217181add353bfa31f56bed8fb2ae6b5cbea7bec772282d463e4b62" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="manifest-merger" version="27.2.2">
<artifact name="manifest-merger-27.2.2.jar">
<md5 value="960a27d184b73b4bdc225aa9a9d63c43" origin="Generated by Gradle"/>
<sha256 value="971974756f32d9e94c857d92772b1499b0b0f5d9c70cb8ebbd20d9bbf804a923" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.build" name="manifest-merger" version="30.2.1">
<artifact name="manifest-merger-30.2.1.jar">
<md5 value="479c71a3f2a7859ad66233f675dd3951" origin="Generated by Gradle"/>
@@ -484,12 +430,6 @@
<sha256 value="c5067a7b928237a1271a5e9cb5710e9f80b4973293945bc51e3a4c864ea4bfed" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.ddms" name="ddmlib" version="27.2.2">
<artifact name="ddmlib-27.2.2.jar">
<md5 value="ac7c733e091492eafb458f2461b3d9c0" origin="Generated by Gradle"/>
<sha256 value="9ab0f9b58737c316af454184705854c75936ca3531f21acc29bd68a3343334d1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.ddms" name="ddmlib" version="30.4.2">
<artifact name="ddmlib-30.4.2.jar">
<md5 value="7e9da34701611ccbdafad6307308f34d" origin="Generated by Gradle"/>
@@ -502,12 +442,6 @@
<sha256 value="93fac87406c97abadb9a58f45776f61cd9aab3b63e1e32471e9271cb3b0d1a14" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.layoutlib" name="layoutlib-api" version="27.2.2">
<artifact name="layoutlib-api-27.2.2.jar">
<md5 value="f95cedd4a5b1785cb662cb74cf7c4652" origin="Generated by Gradle"/>
<sha256 value="f0901f2295d814e82ad95850ea2103dd89d8489e01727fafa55ccccc0dccd163" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.android.tools.layoutlib" name="layoutlib-api" version="30.4.2">
<artifact name="layoutlib-api-30.4.2.jar">
<md5 value="a3615f3e292019a327a7ed70d3439be4" origin="Generated by Gradle"/>
@@ -1030,12 +964,6 @@
<sha256 value="d65226949713c4c61a784f41c51167e7b0316f93764398ebba9e4336b3d954c2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.googlecode.json-simple" name="json-simple" version="1.1">
<artifact name="json-simple-1.1.jar">
<md5 value="eb342044fc56be9ba49fbfc9789f1bb5" origin="Generated by Gradle"/>
<sha256 value="2d9484f4c649f708f47f9a479465fc729770ee65617dca3011836602264f6439" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="com.googlecode.juniversalchardet" name="juniversalchardet" version="1.0.3">
<artifact name="juniversalchardet-1.0.3.jar">
<md5 value="d9ea0a9a275336c175b343f2e4cd8f27" origin="Generated by Gradle"/>
@@ -1480,12 +1408,6 @@
<sha256 value="91e6b318c901a0f2dd1f6ce781d62474435ae627d22fbac9b21bbc39ffd804b6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.10">
<artifact name="commons-codec-1.10.jar">
<md5 value="353cf6a2bdba09595ccfa073b78c7fcb" origin="Generated by Gradle"/>
<sha256 value="4241dfa94e711d435f29a4604a3e2de5c4aa3c165e23bd066be6fc1fc4309569" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="commons-codec" name="commons-codec" version="1.11">
<artifact name="commons-codec-1.11.jar">
<md5 value="567159b1ae257a43e1391a8f59d24cfe" origin="Generated by Gradle"/>
@@ -2222,12 +2144,6 @@
<sha256 value="c705b5c10c18ff3032b9e81742bc2f6b0e5607f6a6dfc0c8ad0cff75d4913042" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="it.unimi.dsi" name="fastutil" version="8.4.0">
<artifact name="fastutil-8.4.0.jar">
<md5 value="74803ff50bd95b5d1e55a2879a5e70e8" origin="Generated by Gradle"/>
<sha256 value="2ad2824a4a0a0eb836b52ee2fc84ba2134f44bce7bfa54015ae3f31c710a3071" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="it.unimi.dsi" name="fastutil" version="8.5.4">
<artifact name="fastutil-8.5.4.jar">
<md5 value="44c80ae2b2326e650ba561f1ba4db8a1" origin="Generated by Gradle"/>
@@ -2588,12 +2504,6 @@
<sha256 value="1df8b9430b5c8ed143d7815e403e33ef5371b2400aadbe9bda0883762e0846d1" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.12">
<artifact name="commons-compress-1.12.jar">
<md5 value="b394a44c74c1e904c1ab6df0893ebb7e" origin="Generated by Gradle"/>
<sha256 value="2c1542faf343185b7cab9c3d55c8ae5471d6d095d3887a4adefdbdf2984dc0b6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.commons" name="commons-compress" version="1.21">
<artifact name="commons-compress-1.21.jar">
<md5 value="2a713d10331bc4e13459a3dc0463f16f" origin="Generated by Gradle"/>
@@ -2654,24 +2564,12 @@
<sha256 value="c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpclient" version="4.5.6">
<artifact name="httpclient-4.5.6.jar">
<md5 value="877aca56579fea38c6358d06408976ba" origin="Generated by Gradle"/>
<sha256 value="c03f813195e7a80e3608d0ddd8da80b21696a4c92a6a2298865bf149071551c7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpcore" version="4.0.1">
<artifact name="httpcore-4.0.1.jar">
<md5 value="6c1963fd8ac0c40c004c9e892e0d7703" origin="Generated by Gradle"/>
<sha256 value="3b6bf92affa85d4169a91547ce3c7093ed993b41ad2df80469fc768ad01e6b6b" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpcore" version="4.4.10">
<artifact name="httpcore-4.4.10.jar">
<md5 value="0aa2d618716ab34e5c0389b44814700a" origin="Generated by Gradle"/>
<sha256 value="78ba1096561957db1b55200a159b648876430342d15d461277e62360da19f6fd" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.apache.httpcomponents" name="httpcore" version="4.4.13">
<artifact name="httpcore-4.4.13.jar">
<md5 value="e07a248f61c52776a2366c075dcd4963" origin="Generated by Gradle"/>
@@ -3182,12 +3080,6 @@
<sha256 value="eb14f69c0395d4a106c6c46fe6dff080c4608ccabc99b1f03933d374383d9bbe" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.56">
<artifact name="bcpkix-jdk15on-1.56.jar">
<md5 value="17b2b704b3ad9b36a6fca1ace60a2a06" origin="Generated by Gradle"/>
<sha256 value="7043dee4e9e7175e93e0b36f45b1ec1ecb893c5f755667e8b916eb8dd201c6ca" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.bouncycastle" name="bcpkix-jdk15on" version="1.67">
<artifact name="bcpkix-jdk15on-1.67.jar">
<md5 value="067945006cabd0a3237e73058a59eabb" origin="Generated by Gradle"/>
@@ -3200,12 +3092,6 @@
<sha256 value="0dc4d181e4d347893c2ddbd2e6cd5d7287fc651c03648fa64b2341c7366b1773" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.56">
<artifact name="bcprov-jdk15on-1.56.jar">
<md5 value="3c1bc7aaf3449308e34296546078d9f7" origin="Generated by Gradle"/>
<sha256 value="963e1ee14f808ffb99897d848ddcdb28fa91ddda867eb18d303e82728f878349" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.bouncycastle" name="bcprov-jdk15on" version="1.67">
<artifact name="bcprov-jdk15on-1.67.jar">
<md5 value="adec6e4828f2438d31715a23889b0bcc" origin="Generated by Gradle"/>
@@ -3740,12 +3626,6 @@
<sha256 value="ed30ed0df6768d51e8bc000bdad6577a10fad7f6c0743f7f28c835390ba5ccb7" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.intellij.deps" name="trove4j" version="1.0.20181211">
<artifact name="trove4j-1.0.20181211.jar">
<md5 value="5cc726d08f3d05f7a7cadd4c20c2de78" origin="Generated by Gradle"/>
<sha256 value="affb7c85a3c87bdcf69ff1dbb84de11f63dc931293934bc08cd7ab18de083601" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.intellij.deps" name="trove4j" version="1.0.20200330">
<artifact name="trove4j-1.0.20200330.jar">
<md5 value="bb75697e375d588a9d3f8f2653b30f77" origin="Generated by Gradle"/>
@@ -3816,12 +3696,6 @@
<sha256 value="38d596755e93cf84e6d00188bff93fc0b70ed279056999a18953e13804dca9c6" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.4.31">
<artifact name="kotlin-reflect-1.4.31.jar">
<md5 value="a970b96602f05c10546cfc086007fed0" origin="Generated by Gradle"/>
<sha256 value="91fad0b42974a7d5811e30a61f05706e176b144235717c6de7e81e3a781028f2" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-reflect" version="1.5.32">
<artifact name="kotlin-reflect-1.5.32.jar">
<md5 value="ec5b3017b555df728581a2b54d9a0f62" origin="Generated by Gradle"/>
@@ -3918,12 +3792,6 @@
<sha256 value="cde3341ba18a2ba262b0b7cf6c55b20c90e8d434e42c9a13e6a3f770db965a88" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.4.31">
<artifact name="kotlin-stdlib-jdk7-1.4.31.jar">
<md5 value="b471182f952997b2ed62911d28321c7a" origin="Generated by Gradle"/>
<sha256 value="1f966e54e86cf4b7d7014afdce04e0f3ee4625084cda3494edccc7b84af52664" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.7.10">
<artifact name="kotlin-stdlib-jdk7-1.7.10.jar">
<md5 value="16e9288ff1d39c8f983507e3cd72e8a8" origin="Generated by Gradle"/>
@@ -3948,12 +3816,6 @@
<sha256 value="af1ec40c3b951afdcc0c2a0173c7b81763c5281c2d5bafbf0a8544a24c5dcc0c" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.4.31">
<artifact name="kotlin-stdlib-jdk8-1.4.31.jar">
<md5 value="7a11cd5fe40b6103e529d281b57b03a9" origin="Generated by Gradle"/>
<sha256 value="b2f8364435ebcb0106ff9d4415a11ffdef8ec7786ee6e5ed465a01556cbd1683" origin="Generated by Gradle"/>
</artifact>
</component>
<component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.7.10">
<artifact name="kotlin-stdlib-jdk8-1.7.10.jar">
<md5 value="83947a5800c9fae4d5e0aa15ed5f186f" origin="Generated by Gradle"/>
libraries/tools/kotlin-gradle-plugin-api/build.gradle.kts
-8
View File
@@ -16,14 +16,6 @@ dependencies {
commonApi(project(":kotlin-tooling-core"))
commonCompileOnly(project(":kotlin-gradle-compiler-types"))
commonCompileOnly("com.android.tools.build:gradle-api:4.2.2") {
// Without it - Gradle dependency resolution fails with unexpected error
// Caused by: java.lang.IllegalStateException: Unexpected parent dependency id 131. Seen ids: [129, 2, 130, 9, 10, 138, 11, 139, 140, 14, 153, 154, 155, 156, 157, 158, 161, 164, 177, 178, 51, 179, 52, 180, 53, 54, 55, 183, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 195, 68, 200, 201, 202, 203, 206, 211, 212, 215, 222, 223, 224, 231, 232, 105, 233, 106, 107, 108, 109, 110, 111, 112, 113, 114, 242, 115, 243, 116, 244, 117, 118, 119, 120, 121, 122]
// at org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.TransientConfigurationResultsBuilder.deserialize(TransientConfigurationResultsBuilder.java:171)
// at org.gradle.api.internal.artifacts.ivyservice.resolveengine.oldresult.TransientConfigurationResultsBuilder.lambda$load$5(TransientConfigurationResultsBuilder.java:117)
// Could be reproduced by running `:kotlin-gradle-plugin-api:gPFFPMP` task
isTransitive = false
}
embedded(project(":kotlin-gradle-compiler-types")) { isTransitive = false }
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CompilerOptionsProjectIT.kt
-2
View File
@@ -444,8 +444,6 @@ class CompilerOptionsProjectIT : KGPBaseTest() {
@DisplayName("KT-57959: should be possible to configure module name in MPP/android")
@GradleAndroidTest
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0)
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_70)
@AndroidGradlePluginTests
@Disabled("DSL was demoted to 'internal'; Design is planned for 2.0")
fun mppAndroidModuleName(
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/ExternalAndroidTargetIT.kt
+1 -1
View File
@@ -19,7 +19,7 @@ import java.nio.file.Path
import kotlin.io.path.readText
import kotlin.test.fail
@GradleTestVersions(minVersion = TestVersions.Gradle.G_8_1)
@GradleTestVersions(minVersion = TestVersions.Gradle.G_8_2)
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_82)
@AndroidGradlePluginTests
class ExternalAndroidTargetIT : KGPBaseTest() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/Kapt3AndroidExternalIT.kt
-1
View File
@@ -194,7 +194,6 @@ open class Kapt3AndroidExternalIT : Kapt3BaseIT() {
@DisplayName("kapt works with androidx")
@GradleAndroidTest
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_42, maxVersion = TestVersions.AGP.AGP_42)
fun testDatabindingWithAndroidX(
gradleVersion: GradleVersion,
agpVersion: String,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/KotlinAndroidMppIT.kt
+23 -56
View File
@@ -8,10 +8,6 @@ package org.jetbrains.kotlin.gradle.android
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.gradle.testbase.TestVersions.AGP.AGP_70
import org.jetbrains.kotlin.gradle.testbase.TestVersions.AGP.AGP_71
import org.jetbrains.kotlin.gradle.testbase.TestVersions.Gradle.G_7_1
import org.jetbrains.kotlin.gradle.testbase.TestVersions.Gradle.G_7_2
import org.jetbrains.kotlin.gradle.tooling.BuildKotlinToolingMetadataTask
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.jetbrains.kotlin.gradle.util.replaceText
@@ -28,8 +24,6 @@ import kotlin.test.*
@DisplayName("kotlin-android with mpp")
@AndroidGradlePluginTests
@GradleTestVersions(minVersion = G_7_1)
@AndroidTestVersions(minVersion = AGP_70)
class KotlinAndroidMppIT : KGPBaseTest() {
@DisplayName("KotlinToolingMetadataArtifact is bundled into apk")
@@ -67,8 +61,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
}
}
@AndroidTestVersions(minVersion = AGP_71)
@GradleTestVersions(minVersion = G_7_2)
@DisplayName("mpp source sets are registered in AGP")
@GradleAndroidTest
fun testAndroidMppSourceSets(
@@ -133,8 +125,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
}
}
@AndroidTestVersions(minVersion = AGP_70)
@GradleTestVersions(minVersion = G_7_2)
@DisplayName("android mpp lib flavors publication can be configured")
@GradleAndroidTest
fun testMppAndroidLibFlavorsPublication(
@@ -266,17 +256,10 @@ class KotlinAndroidMppIT : KGPBaseTest() {
build("publish") {
listOf("fooBar", "fooBaz").forEach { flavorName ->
val flavor = flavorName.lowercase()
val flavorAttributes = if (AGPVersion.fromString(agpVersion) > AGPVersion.v7_0_0) {
arrayOf(
"foo" to flavorName,
"com.android.build.api.attributes.ProductFlavor:foo" to flavorName
)
} else {
arrayOf(
"foo" to flavorName
)
}
val flavorAttributes = arrayOf(
"foo" to flavorName,
"com.android.build.api.attributes.ProductFlavor:foo" to flavorName
)
assertFileExists(groupDir.resolve("lib-androidlib-$flavor/1.0/lib-androidlib-$flavor-1.0.aar"))
assertFileExists(groupDir.resolve("lib-androidlib-$flavor/1.0/lib-androidlib-$flavor-1.0-sources.jar"))
@@ -319,16 +302,10 @@ class KotlinAndroidMppIT : KGPBaseTest() {
listOf("fooBar", "fooBaz").forEach { flavorName ->
val flavor = flavorName.lowercase()
val flavorAttributes = if (AGPVersion.fromString(agpVersion) > AGPVersion.v7_0_0) {
arrayOf(
"foo" to flavorName,
"com.android.build.api.attributes.ProductFlavor:foo" to flavorName
)
} else {
arrayOf(
"foo" to flavorName
)
}
val flavorAttributes = arrayOf(
"foo" to flavorName,
"com.android.build.api.attributes.ProductFlavor:foo" to flavorName
)
listOf("-debug", "").forEach { buildType ->
assertFileExists(groupDir.resolve("lib-androidlib-$flavor$buildType/1.0/lib-androidlib-$flavor$buildType-1.0.aar"))
@@ -587,8 +564,6 @@ class KotlinAndroidMppIT : KGPBaseTest() {
}
}
@AndroidTestVersions(minVersion = AGP_70)
@GradleTestVersions(minVersion = G_7_2)
@DisplayName("KT-27714: custom attributes are copied to android compilation configurations")
@GradleAndroidTest
fun testCustomAttributesInAndroidTargets(
@@ -796,10 +771,9 @@ class KotlinAndroidMppIT : KGPBaseTest() {
}
}
// TODO: improve it via KT-63409
@DisplayName("produced artifacts are consumable by projects with various AGP versions")
@GradleAndroidTest
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_71)
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_2) // due AGP version limit ^
fun testAndroidMultiplatformPublicationAGPCompatibility(
gradleVersion: GradleVersion,
agpVersion: String,
@@ -822,30 +796,20 @@ class KotlinAndroidMppIT : KGPBaseTest() {
}
}
val checkedConsumerAGPVersions = AGPVersion.testedVersions
.filter { version -> version >= AGPVersion.fromString(TestVersions.AGP.AGP_42) }
.filter { version -> version < AGPVersion.fromString(TestVersions.AGP.MAX_SUPPORTED) }
.map { it.toString() }
val checkedConsumerAGPVersions = TestVersions.AgpCompatibilityMatrix
.values()
.filter { agp -> AGPVersion.fromString(agp.version) < AGPVersion.fromString(TestVersions.AGP.MAX_SUPPORTED) }
checkedConsumerAGPVersions.forEach { consumerAgpVersion ->
val agpTestVersion = TestVersions.AgpCompatibilityMatrix.values().find { it.version == consumerAgpVersion }
?: fail("AGP version $consumerAgpVersion is not defined in TestVersions.AGP!")
val consumerGradleVersion = when {
gradleVersion < agpTestVersion.minSupportedGradleVersion -> agpTestVersion.minSupportedGradleVersion
gradleVersion > agpTestVersion.maxSupportedGradleVersion -> agpTestVersion.maxSupportedGradleVersion
else -> gradleVersion
}
println("Testing compatibility for AGP consumer version $consumerAgpVersion on Gradle ${consumerGradleVersion.version} (Producer: $agpVersion)")
println(
"Testing compatibility for AGP consumer version $consumerAgpVersion on Gradle" +
" ${consumerAgpVersion.minSupportedGradleVersion} (Producer: $agpVersion)"
)
project(
"new-mpp-android-agp-compatibility",
consumerGradleVersion,
buildOptions = defaultBuildOptions.copy(androidVersion = consumerAgpVersion)
.suppressDeprecationWarningsOn(
"AGP relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty which has been deprecated."
) { options ->
consumerGradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_4) && AGPVersion.fromString(options.safeAndroidVersion) < AGPVersion.v7_1_0
},
buildJdk = jdkVersion.location,
consumerAgpVersion.minSupportedGradleVersion,
buildOptions = defaultBuildOptions.copy(androidVersion = consumerAgpVersion.version),
buildJdk = File(System.getProperty("jdk${consumerAgpVersion.requiredJdkVersion.majorVersion}Home")),
localRepoDir = tempDir
) {
/*
@@ -860,7 +824,10 @@ class KotlinAndroidMppIT : KGPBaseTest() {
*/
build(":plainAndroidConsumer:assemble")
}
println("Successfully tested compatibility for AGP consumer version $consumerAgpVersion on Gradle ${consumerGradleVersion.version} (Producer: $agpVersion)")
println(
"Successfully tested compatibility for AGP consumer version $consumerAgpVersion on Gradle" +
" ${consumerAgpVersion.minSupportedGradleVersion} (Producer: $agpVersion)"
)
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/android/MultiplatformAndroidSourceSetLayoutV2IT.kt
+1 -9
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.gradle.android
import org.gradle.util.GradleVersion
import org.jetbrains.kotlin.gradle.testbase.*
import org.jetbrains.kotlin.gradle.util.AGPVersion
import org.junit.jupiter.api.DisplayName
import kotlin.test.assertNull
@@ -17,18 +16,11 @@ class MultiplatformAndroidSourceSetLayoutV2IT : KGPBaseTest() {
@GradleAndroidTest
@DisplayName("test Android project with flavors")
@AndroidTestVersions(minVersion = "7.0.4")
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0) // due AGP version limit ^
fun testProjectWithFlavors(gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk) {
project(
"multiplatformAndroidSourceSetLayout2",
gradleVersion,
defaultBuildOptions.copy(androidVersion = agpVersion)
.suppressDeprecationWarningsOn(
"AGP relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty which has been deprecated."
) { options ->
gradleVersion >= GradleVersion.version(TestVersions.Gradle.G_7_4) && AGPVersion.fromString(options.safeAndroidVersion) < AGPVersion.v7_1_0
},
defaultBuildOptions.copy(androidVersion = agpVersion),
buildJdk = jdkVersion.location
) {
build("test") {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/AndroidAndJavaConsumeMppLibIT.kt
+13 -13
View File
@@ -27,10 +27,11 @@ import java.lang.Boolean as RefBoolean
// Tests are not working with AGP >= 7.1.0. See KT-57351 for details
@Ignore("TODO: update this test via KT-58298")
class AndroidAndJavaConsumeMppLibBuiltByGradle7IT : AndroidAndJavaConsumeMppLibIT() {
override val producerAgpVersion: AGPVersion = AGPVersion.v7_0_0
override val producerAgpVersion: AGPVersion = AGPVersion.v7_1_0
override val producerGradleVersion: GradleVersionRequired = GradleVersionRequired.InRange(
TestVersions.Gradle.G_7_0,
TestVersions.Gradle.G_7_1,
TestVersions.Gradle.G_7_6
)
}
@@ -67,8 +68,7 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() {
@Parameterized.Parameters(name = "Consumer(AGP={3}, Gradle={4}), flavors={0}, debugOnly={1}, published={2}")
fun testCases(): List<Array<Any>> {
val consumers = listOf(
AGPVersion.v4_2_0 to GradleVersionRequired.Exact(TestVersions.Gradle.G_6_9),
AGPVersion.v7_0_0 to GradleVersionRequired.AtLeast(TestVersions.Gradle.G_7_6),
AGPVersion.v7_1_0 to GradleVersionRequired.AtLeast(TestVersions.Gradle.G_7_6),
)
val buildParams = listOf(
/* useFlavors, isAndroidPublishDebugOnly, isPublishedLibrary */
@@ -120,16 +120,12 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() {
val producerBuildOptions: BuildOptions
dependencyProject = Project("new-mpp-android", producerGradleVersion, minLogLevel = LogLevel.INFO).apply {
val usedProducerGradleVersion = chooseWrapperVersionOrFinishTest()
chooseWrapperVersionOrFinishTest()
producerBuildOptions = defaultBuildOptions().copy(
javaHome = jdk11Home,
androidHome = KtTestUtil.findAndroidSdk(),
androidGradlePluginVersion = producerAgpVersion,
).suppressDeprecationWarningsOn(
"AGP relies on FileTrees for ignoring empty directories when using @SkipWhenEmpty which has been deprecated (Gradle 7.4)"
) { options ->
GradleVersion.version(usedProducerGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_4) && options.safeAndroidGradlePluginVersion < AGPVersion.v7_1_0
}
)
producerBuildOptions.androidHome?.let { acceptAndroidSdkLicenses(it) }
projectDir.deleteRecursively()
setupWorkingDir()
@@ -296,7 +292,11 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() {
"AGP uses deprecated IncrementalTaskInputs (Gradle 7.5)"
) { options ->
// looks a bit messy :/
(!isPublishedLibrary && (withKotlinVersion != null || options.safeAndroidGradlePluginVersion >= AGPVersion.v7_0_0) || isPublishedLibrary && withKotlinVersion == oldKotlinVersion) &&
(!isPublishedLibrary &&
(withKotlinVersion != null || options.safeAndroidGradlePluginVersion >= AGPVersion.v7_1_0) ||
isPublishedLibrary &&
withKotlinVersion == oldKotlinVersion
) &&
GradleVersion.version(usedConsumerGradleVersion) >= GradleVersion.version(TestVersions.Gradle.G_7_5) &&
options.safeAndroidGradlePluginVersion < AGPVersion.v7_3_0
}
@@ -308,7 +308,7 @@ abstract class AndroidAndJavaConsumeMppLibIT : BaseGradleIT() {
* This test asserts the existing incorrect behavior for older Gradle versions
* in the absence of the Kotlin Gradle plugin, in order to detect unintentional changes
*/
val expectedVariant = if (consumerAgpVersion < AGPVersion.v7_0_0 && withKotlinVersion == null && !isPublishedLibrary) {
val expectedVariant = if (withKotlinVersion == null && !isPublishedLibrary) {
"jvmLibApiElements"
} else expected
@@ -375,7 +375,7 @@ class ResolvedVariantChecker {
}
}
fun getResolvedVariantsBatch(
private fun getResolvedVariantsBatch(
project: BaseGradleIT.Project,
requests: Iterable<ResolvedVariantRequest>,
buildOptions: BaseGradleIT.BuildOptions = project.testCase.defaultBuildOptions()
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt
-2
View File
@@ -354,8 +354,6 @@ class MppCompositeBuildIT : KGPBaseTest() {
}
}
@GradleTestVersions(minVersion = TestVersions.Gradle.G_7_1)
@AndroidTestVersions(minVersion = TestVersions.AGP.AGP_70)
@GradleAndroidTest
fun `test - sample6-KT-56712-umbrella-composite`(
gradleVersion: GradleVersion, agpVersion: String, jdkVersion: JdkVersions.ProvidedJdk,
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/TestVersions.kt
+4 -8
View File
@@ -42,17 +42,15 @@ interface TestVersions {
}
object AGP {
const val AGP_42 = "4.2.2"
const val AGP_70 = "7.0.4"
const val AGP_71 = "7.1.3"
const val AGP_72 = "7.2.2"
const val AGP_73 = "7.3.1"
const val AGP_74 = "7.4.2"
const val AGP_80 = "8.0.2"
const val AGP_81 = "8.1.0-rc01"
const val AGP_82 = "8.2.0-alpha13"
const val AGP_81 = "8.1.3"
const val AGP_82 = "8.2.0-rc03"
const val MIN_SUPPORTED = AGP_42 // KotlinAndroidPlugin.minimalSupportedAgpVersion
const val MIN_SUPPORTED = AGP_71 // KotlinAndroidPlugin.minimalSupportedAgpVersion
const val MAX_SUPPORTED = AGP_81 // Update once Gradle MAX_SUPPORTED version will be bumped
}
@@ -62,15 +60,13 @@ interface TestVersions {
val maxSupportedGradleVersion: GradleVersion,
val requiredJdkVersion: JavaVersion
) {
AGP_42(AGP.AGP_42, GradleVersion.version(Gradle.MIN_SUPPORTED), GradleVersion.version(Gradle.G_6_9), JavaVersion.VERSION_1_8),
AGP_70(AGP.AGP_70, GradleVersion.version(Gradle.G_7_0), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11),
AGP_71(AGP.AGP_71, GradleVersion.version(Gradle.G_7_2), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11),
AGP_72(AGP.AGP_72, GradleVersion.version(Gradle.G_7_3), GradleVersion.version(Gradle.G_7_4), JavaVersion.VERSION_11),
AGP_73(AGP.AGP_73, GradleVersion.version(Gradle.G_7_4), GradleVersion.version(Gradle.G_7_5), JavaVersion.VERSION_11),
AGP_74(AGP.AGP_74, GradleVersion.version(Gradle.G_7_5), GradleVersion.version(Gradle.G_7_6), JavaVersion.VERSION_11),
AGP_80(AGP.AGP_80, GradleVersion.version(Gradle.G_8_0), GradleVersion.version(Gradle.G_8_0), JavaVersion.VERSION_17),
AGP_81(AGP.AGP_81, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_1), JavaVersion.VERSION_17),
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_1), GradleVersion.version(Gradle.G_8_3), JavaVersion.VERSION_17),
AGP_82(AGP.AGP_82, GradleVersion.version(Gradle.G_8_2), GradleVersion.version(Gradle.G_8_3), JavaVersion.VERSION_17),
;
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/argumentProviders.kt
+4 -5
View File
@@ -177,14 +177,13 @@ class GradleAndAgpArgumentsProvider : GradleArgumentsProvider() {
gradleVersions
.filter { it in agpVersion.minSupportedGradleVersion..agpVersion.maxSupportedGradleVersion }
.ifEmpty {
// Falling back to the minimal supported Gradle version for this AGP version
listOf(agpVersion.minSupportedGradleVersion)
}
.map {
AgpTestArguments(it, agpVersion.version, providedJdk)
}
.also {
require(it.isNotEmpty()) {
"Could not find suitable Gradle version for AGP $agpVersion version!"
}
}
}
.asSequence()
.map {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/AGPVersion.kt
-7
View File
@@ -18,14 +18,7 @@ class AGPVersion private constructor(private val versionNumber: VersionNumber) {
fun fromString(versionString: String): AGPVersion =
AGPVersion(VersionNumber.parse(versionString))
val v4_1_0 = fromString("4.1.3")
val v4_2_0 = fromString("4.2.2")
val v7_0_0 = fromString("7.0.4")
val v7_1_0 = fromString("7.1.3")
val v7_2_2 = fromString("7.2.2")
val v7_3_0 = fromString("7.3.1")
val v7_4_0 = fromString("7.4.2")
val testedVersions = listOf(v4_1_0, v4_2_0, v7_0_0, v7_1_0, v7_2_2, v7_3_0, v7_4_0)
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/externalAndroidTarget-project2project/build.gradle.kts
+1 -1
View File
@@ -21,7 +21,7 @@ kotlin {
compileSdk = 33
namespace = "org.jetbrains.sample"
withAndroidTestOnJvm()
withAndroidTestOnJvm {}
sourceSets.getByName("androidTestOnJvm").dependencies {
implementation("junit:junit:4.13.2")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/externalAndroidTarget-simple/build.gradle.kts
+1 -1
View File
@@ -17,7 +17,7 @@ kotlin {
compileSdk = 33
namespace = "org.jetbrains.sample"
withAndroidTestOnJvm()
withAndroidTestOnJvm {}
sourceSets.getByName("androidTestOnJvm").dependencies {
implementation("junit:junit:4.13.2")
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding-androidX/app/build.gradle
+10 -8
View File
@@ -1,13 +1,16 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
id 'org.jetbrains.kotlin.kapt'
}
android {
compileSdkVersion 24
compileSdkVersion 34
namespace = "com.example.databinding"
defaultConfig {
applicationId "com.example.databinding"
minSdkVersion 21
targetSdkVersion 24
targetSdkVersion 34
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,6 +27,5 @@ android {
}
dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
}
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding-androidX/app/src/main/AndroidManifest.xml
+2 -5
View File
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.databinding">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application />
</manifest>
</manifest>
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding-androidX/build.gradle
+2 -20
View File
@@ -1,26 +1,8 @@
import org.gradle.util.VersionNumber
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
mavenLocal()
maven { url 'https://maven.google.com' }
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:$android_tools_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
allprojects {
repositories {
mavenLocal()
maven { url 'https://maven.google.com' }
google()
mavenCentral()
}
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kapt2/android-databinding-androidX/gradle.properties
+3 -1
View File
@@ -1,2 +1,4 @@
android.enableJetifier=true
android.useAndroidX=true
android.useAndroidX=true
kotlin.jvm.target.validation.mode=warning
libraries/tools/kotlin-gradle-plugin/build.gradle.kts
+5 -19
View File
@@ -67,25 +67,11 @@ dependencies {
commonCompileOnly(project(":kotlin-compiler-runner-unshaded"))
commonCompileOnly(project(":kotlin-gradle-statistics"))
commonCompileOnly(project(":kotlin-gradle-build-metrics"))
commonCompileOnly("com.android.tools.build:gradle:4.2.2") {
exclude("org.ow2.asm")
exclude("net.sf.proguard")
exclude("net.sf.jopt-simple")
exclude("com.squareup")
exclude("com.google.crypto.tink")
exclude("com.google.guava")
exclude("com.google.protobuf")
exclude("com.google.testing.platform")
exclude("com.android.tools.lint")
exclude("androidx.databinding")
exclude("com.android.tools.analytics-library")
exclude("com.android.tools.build.jetifier")
exclude("com.android.tools.build", "transform-api")
exclude("com.android.tools.build", "builder-test-api")
exclude("com.android.tools.build", "bundletool")
exclude("com.android.tools.build", "aaptcompiler")
exclude("com.android.tools.build", "aapt2-proto")
}
commonCompileOnly(libs.android.gradle.plugin.gradle.api) { isTransitive = false }
commonCompileOnly(libs.android.gradle.plugin.gradle) { isTransitive = false }
commonCompileOnly(libs.android.gradle.plugin.builder) { isTransitive = false }
commonCompileOnly(libs.android.gradle.plugin.builder.model) { isTransitive = false }
commonCompileOnly(libs.android.tools.common) { isTransitive = false }
commonCompileOnly(intellijPlatformUtil())
commonCompileOnly(commonDependency("org.jetbrains.teamcity:serviceMessages"))
commonCompileOnly(libs.gradle.enterprise.gradlePlugin)
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinAndroidPlugin.kt
+1 -1
View File
@@ -56,7 +56,7 @@ internal open class KotlinAndroidPlugin(
}
companion object {
private val minimalSupportedAgpVersion = AndroidGradlePluginVersion(4, 2, 2)
private val minimalSupportedAgpVersion = AndroidGradlePluginVersion(7, 1, 3)
fun androidTargetHandler(): AndroidProjectHandler {
val tasksProvider = KotlinTasksProvider()
val androidGradlePluginVersion = AndroidGradlePluginVersion.currentOrNull
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPluginWrapper.kt
+5
View File
@@ -186,6 +186,11 @@ abstract class DefaultKotlinBasePlugin : KotlinBasePlugin {
ConfigurationCacheStartParameterAccessor.Factory::class,
DefaultConfigurationCacheStartParameterAccessorVariantFactory()
)
factories.putIfAbsent(
SourceSetCompatibilityHelper.SourceSetCompatibilityHelperVariantFactory::class,
DefaultSourceSetCompatibilityHelperVariantFactory()
)
}
protected fun setupAttributeMatchingStrategy(
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinTargetConfigurator.kt
-12
View File
@@ -6,17 +6,9 @@
package org.jetbrains.kotlin.gradle.plugin
import org.gradle.api.Named
import org.gradle.api.NamedDomainObjectContainer
import org.gradle.api.Project
import org.gradle.api.artifacts.Configuration
import org.gradle.api.artifacts.type.ArtifactTypeDefinition
import org.gradle.api.attributes.*
import org.gradle.api.plugins.BasePlugin
import org.gradle.api.plugins.ExtensionAware
import org.gradle.api.plugins.JavaBasePlugin
import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.bundling.Jar
import org.gradle.api.tasks.bundling.Zip
import org.jetbrains.kotlin.gradle.plugin.mpp.*
import org.jetbrains.kotlin.gradle.plugin.mpp.compilationImpl.runKotlinCompilationSideEffects
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
@@ -24,11 +16,7 @@ import org.jetbrains.kotlin.gradle.targets.js.KotlinWasmTargetAttribute
import org.jetbrains.kotlin.gradle.targets.js.ir.KotlinJsIrTarget
import org.jetbrains.kotlin.gradle.targets.js.toAttribute
import org.jetbrains.kotlin.gradle.targets.runKotlinTargetSideEffects
import org.jetbrains.kotlin.gradle.tasks.registerTask
import org.jetbrains.kotlin.gradle.utils.*
import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
import kotlin.reflect.KMutableProperty1
import kotlin.reflect.full.memberProperties
interface KotlinTargetConfigurator<KotlinTargetType : KotlinTarget> {
fun configureTarget(
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/SourceSetCompatibilityHelper.kt
+30
View File
@@ -0,0 +1,30 @@
/*
* Copyright 2010-2023 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.tasks.SourceSet
import org.jetbrains.kotlin.gradle.plugin.VariantImplementationFactories
interface SourceSetCompatibilityHelper {
fun getCompileConfigurationName(sourceSet: SourceSet): String?
fun getRuntimeConfigurationName(sourceSet: SourceSet): String?
interface SourceSetCompatibilityHelperVariantFactory : VariantImplementationFactories.VariantImplementationFactory {
fun getInstance(): SourceSetCompatibilityHelper
}
}
internal class DefaultSourceSetCompatibilityHelperVariantFactory : SourceSetCompatibilityHelper.SourceSetCompatibilityHelperVariantFactory {
override fun getInstance(): SourceSetCompatibilityHelper = DefaultSourceSetCompatibilityHelper()
}
internal class DefaultSourceSetCompatibilityHelper() : SourceSetCompatibilityHelper {
override fun getCompileConfigurationName(sourceSet: SourceSet): String? = null
override fun getRuntimeConfigurationName(sourceSet: SourceSet): String? = null
}
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/jvm/KotlinJvmTarget.kt
+21 -24
View File
@@ -29,6 +29,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPluginLifecycle.Stage.AfterFinal
import org.jetbrains.kotlin.gradle.plugin.diagnostics.KotlinToolingDiagnostics
import org.jetbrains.kotlin.gradle.plugin.diagnostics.reportDiagnostic
import org.jetbrains.kotlin.gradle.plugin.internal.JavaSourceSetsAccessor
import org.jetbrains.kotlin.gradle.plugin.internal.SourceSetCompatibilityHelper
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinJvmCompilation
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinOnlyTarget
import org.jetbrains.kotlin.gradle.plugin.mpp.internal
@@ -41,10 +42,8 @@ import org.jetbrains.kotlin.gradle.utils.*
import org.jetbrains.kotlin.gradle.utils.Future
import org.jetbrains.kotlin.gradle.utils.findAppliedAndroidPluginIdOrNull
import org.jetbrains.kotlin.gradle.utils.future
import org.jetbrains.kotlin.utils.addToStdlib.cast
import java.util.concurrent.Callable
import javax.inject.Inject
import kotlin.reflect.full.functions
abstract class KotlinJvmTarget @Inject constructor(
project: Project,
@@ -168,8 +167,11 @@ abstract class KotlinJvmTarget @Inject constructor(
}
project.launchInStage(AfterFinaliseDsl) {
val sourceSetCompatibilityHelper = project
.variantImplementationFactory<SourceSetCompatibilityHelper.SourceSetCompatibilityHelperVariantFactory>()
.getInstance()
javaSourceSets.all { javaSourceSet ->
copyUserDefinedAttributesToJavaConfigurations(javaSourceSet)
copyUserDefinedAttributesToJavaConfigurations(javaSourceSet, sourceSetCompatibilityHelper)
}
}
@@ -259,12 +261,13 @@ abstract class KotlinJvmTarget @Inject constructor(
// Add the Java source set dependencies to the Kotlin compilation compile & runtime configurations:
val sourceSetCompatibilityHelper = project
.variantImplementationFactory<SourceSetCompatibilityHelper.SourceSetCompatibilityHelperVariantFactory>()
.getInstance()
val compileConfigurationName = if (areRuntimeOrCompileConfigurationsAvailable()) {
javaSourceSet::class
.functions
.find { it.name == "getCompileConfigurationName" }
?.call(javaSourceSet)
?.cast<String>()
sourceSetCompatibilityHelper
.getCompileConfigurationName(javaSourceSet)
?.takeIf { project.configurations.findByName(it) != null }
} else null
@@ -278,11 +281,8 @@ abstract class KotlinJvmTarget @Inject constructor(
}
val runtimeConfigurationName = if (areRuntimeOrCompileConfigurationsAvailable()) {
javaSourceSet::class
.functions
.find { it.name == "getRuntimeConfigurationName" }
?.call(javaSourceSet)
?.cast<String>()
sourceSetCompatibilityHelper
.getRuntimeConfigurationName(javaSourceSet)
?.takeIf { project.configurations.findByName(it) != null }
} else null
@@ -296,22 +296,19 @@ abstract class KotlinJvmTarget @Inject constructor(
}
}
private fun copyUserDefinedAttributesToJavaConfigurations(javaSourceSet: SourceSet) {
private fun copyUserDefinedAttributesToJavaConfigurations(
javaSourceSet: SourceSet,
sourceSetCompatibilityHelper: SourceSetCompatibilityHelper
) {
val compileConfigurationName = if (areRuntimeOrCompileConfigurationsAvailable()) {
javaSourceSet::class
.functions
.find { it.name == "getCompileConfigurationName" }
?.call(javaSourceSet)
?.cast<String>()
sourceSetCompatibilityHelper
.getCompileConfigurationName(javaSourceSet)
?.takeIf { project.configurations.findByName(it) != null }
} else null
val runtimeConfigurationName = if (areRuntimeOrCompileConfigurationsAvailable()) {
javaSourceSet::class
.functions
.find { it.name == "getRuntimeConfigurationName" }
?.call(javaSourceSet)
?.cast<String>()
sourceSetCompatibilityHelper
.getRuntimeConfigurationName(javaSourceSet)
?.takeIf { project.configurations.findByName(it) != null }
} else null
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/PluginWrappers.kt
+2 -1
View File
@@ -10,7 +10,6 @@ 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 org.jetbrains.kotlin.gradle.plugin.internal.JavaSourceSetsAccessorG6
@@ -161,4 +160,6 @@ private fun Project.registerVariantImplementations() {
factories[UnameExecutor.UnameExecutorVariantFactory::class] =
UnameExecutorG6.UnameExecutorVariantFactoryG6()
factories[ConfigurationCacheStartParameterAccessor.Factory::class] = ConfigurationCacheStartParameterAccessorG6.Factory()
factories[SourceSetCompatibilityHelper.SourceSetCompatibilityHelperVariantFactory::class] =
SourceSetCompatibilityHelperG6VariantFactory()
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/internal/SourceSetCompatibilityHelperG6.kt
+24
View File
@@ -0,0 +1,24 @@
/*
* Copyright 2010-2023 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.tasks.SourceSet
internal class SourceSetCompatibilityHelperG6 : SourceSetCompatibilityHelper {
override fun getCompileConfigurationName(sourceSet: SourceSet): String {
@Suppress("DEPRECATION")
return sourceSet.compileConfigurationName
}
override fun getRuntimeConfigurationName(sourceSet: SourceSet): String {
@Suppress("DEPRECATION")
return sourceSet.runtimeConfigurationName
}
}
internal class SourceSetCompatibilityHelperG6VariantFactory : SourceSetCompatibilityHelper.SourceSetCompatibilityHelperVariantFactory {
override fun getInstance(): SourceSetCompatibilityHelper = SourceSetCompatibilityHelperG6()
}