Merge pull request #2856 from element-hq/feature/bma/asJelly

Kotlin 1.9.24 and Android Jellyfish change.
This commit is contained in:
ganfra 2024-05-17 12:05:38 +02:00 committed by GitHub
commit cd03a83797
2 changed files with 2 additions and 1 deletions

1
.gitignore vendored
View file

@ -45,6 +45,7 @@ captures/
.idea/assetWizardSettings.xml .idea/assetWizardSettings.xml
.idea/compiler.xml .idea/compiler.xml
.idea/deploymentTargetDropDown.xml .idea/deploymentTargetDropDown.xml
.idea/deploymentTargetSelector.xml
.idea/gradle.xml .idea/gradle.xml
.idea/jarRepositories.xml .idea/jarRepositories.xml
.idea/misc.xml .idea/misc.xml

2
.idea/kotlinc.xml generated
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="KotlinJpsPluginSettings"> <component name="KotlinJpsPluginSettings">
<option name="version" value="1.9.23" /> <option name="version" value="1.9.24" />
</component> </component>
</project> </project>