Skip to content

Commit 72d2325

Browse files
dependabot[bot]dependabot[bot]
authored
build(deps): bump the dependencies group across 2 directories with 5 updates (#289)
Bumps the dependencies group with 3 updates in the /android directory: com.android.tools.build:gradle, [org.jetbrains.kotlin:kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) and org.jlleitschuh.gradle:ktlint-gradle. Bumps the dependencies group with 2 updates in the /example/android directory: org.jetbrains.kotlin.android and org.jlleitschuh.gradle.ktlint. Updates `com.android.tools.build:gradle` from 8.10.1 to 8.11.1 Updates `org.jetbrains.kotlin:kotlin-gradle-plugin` from 2.1.21 to 2.2.0 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/JetBrains/kotlin/releases">org.jetbrains.kotlin:kotlin-gradle-plugin's releases</a>.</em></p> <blockquote> <h2>Kotlin 2.2.0</h2> <h2>Changelog</h2> <h3>Analysis API</h3> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-73337"><code>KT-73337</code></a> Migrate analysis sources to new IR parameter API</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-75880"><code>KT-75880</code></a> K2 Mode: Typealias reference resolves to the underlying class in KMP project</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74246"><code>KT-74246</code></a> KaVisibilityChecker.isVisible is inefficient with multiple calls on the same use-site</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-57733"><code>KT-57733</code></a> Analysis API: Use optimized <code>ModuleWithDependenciesScope</code>s in combined symbol providers</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69535"><code>KT-69535</code></a> Redesign 'containingSymbol'</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69950"><code>KT-69950</code></a> Analysis API: Introduce <code>isSubtypeOf(ClassId)</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68393"><code>KT-68393</code></a> Analysis API: Rename <code>KaClassLikeSymbol. classIdIfNonLocal</code> to <code>classId</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-62924"><code>KT-62924</code></a> Analysis API: rename KtCallableSymbol.callableIdIfNonLocal -&gt; callableId</li> </ul> <h3>Analysis API. Code Compilation</h3> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-75502"><code>KT-75502</code></a> K2: IDEA hangs when evaluating inside kotlin-stdlib modules in the Kotlin project</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73077"><code>KT-73077</code></a> Evaluation of inline functions is broken inside Kotlin project and Amper module in Idea sources</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73936"><code>KT-73936</code></a> K2: CyclicInlineDependencyException: Inline functions have a cyclic dependency in evaluator</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74582"><code>KT-74582</code></a> InterpreterMethodNotFoundError when trying to evaluate simple expressions after recent fixes</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74524"><code>KT-74524</code></a> Compilation exception with incorrect JvmName annotation arguments</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74443"><code>KT-74443</code></a> Compilation peer collector ignores inline property accessors</li> </ul> <h3>Analysis API. FIR</h3> <h4>New Features</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-73493"><code>KT-73493</code></a> Support context parameters</li> </ul> <h4>Performance Improvements</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-75790"><code>KT-75790</code></a> Experiment with increasing DEFAULT_LOCKING_INTERVAL time</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-72159"><code>KT-72159</code></a> LLFirCompilerRequiredAnnotationsTargetResolver: consider rewriting it to use honest jumping locks</li> </ul> <h4>Fixes</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-76331"><code>KT-76331</code></a> Cleanup FileStructureElement for classes</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73117"><code>KT-73117</code></a> K2 AA: Exception &quot;Setter is not found&quot; when val has a setter without body</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76540"><code>KT-76540</code></a> K2: Missing library dependency on Android SDK from androidx.activity-1.8.2 causes LiveEdit failures</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73266"><code>KT-73266</code></a> K2. &quot;Declaration should have non-local container&quot; with unclosed annotation on top-level function</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76432"><code>KT-76432</code></a> JavaClassUseSiteMemberScope: Expected FirResolvedTypeRef with ConeKotlinType but was FirUserTypeRefImpl</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76217"><code>KT-76217</code></a> K2 AA: &quot;No fir element was found for KtParameter&quot; with multiple context parameter lists</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74740"><code>KT-74740</code></a> Highlighting is broken after the built-in serialization refactoring</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76366"><code>KT-76366</code></a> ContextCollector: annotations on class members don't have the class as implicit receiver</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76352"><code>KT-76352</code></a> ContextCollector: wrong class annotation context in BODY mode</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76341"><code>KT-76341</code></a> ContextCollector: support dangling modifiers</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76332"><code>KT-76332</code></a> &quot;Declaration should have non-local container&quot; for declaration inside file annotation</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76115"><code>KT-76115</code></a> Disable <code>FirElementBuilder#getFirForElementInsideAnnotations</code> optimization for files, classes and scripts</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76347"><code>KT-76347</code></a> ContextCollector: avoid resolution for enum entry annotations</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76272"><code>KT-76272</code></a> Cleanup AbstractFileStructureTest</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md">org.jetbrains.kotlin:kotlin-gradle-plugin's changelog</a>.</em></p> <blockquote> <h2>2.2.0</h2> <h3>Analysis API</h3> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-73337"><code>KT-73337</code></a> Migrate analysis sources to new IR parameter API</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-75880"><code>KT-75880</code></a> K2 Mode: Typealias reference resolves to the underlying class in KMP project</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74246"><code>KT-74246</code></a> KaVisibilityChecker.isVisible is inefficient with multiple calls on the same use-site</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-57733"><code>KT-57733</code></a> Analysis API: Use optimized <code>ModuleWithDependenciesScope</code>s in combined symbol providers</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69535"><code>KT-69535</code></a> Redesign 'containingSymbol'</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69950"><code>KT-69950</code></a> Analysis API: Introduce <code>isSubtypeOf(ClassId)</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68393"><code>KT-68393</code></a> Analysis API: Rename <code>KaClassLikeSymbol. classIdIfNonLocal</code> to <code>classId</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-62924"><code>KT-62924</code></a> Analysis API: rename KtCallableSymbol.callableIdIfNonLocal -&gt; callableId</li> </ul> <h3>Analysis API. Code Compilation</h3> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-75502"><code>KT-75502</code></a> K2: IDEA hangs when evaluating inside kotlin-stdlib modules in the Kotlin project</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73077"><code>KT-73077</code></a> Evaluation of inline functions is broken inside Kotlin project and Amper module in Idea sources</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73936"><code>KT-73936</code></a> K2: CyclicInlineDependencyException: Inline functions have a cyclic dependency in evaluator</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74582"><code>KT-74582</code></a> InterpreterMethodNotFoundError when trying to evaluate simple expressions after recent fixes</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74524"><code>KT-74524</code></a> Compilation exception with incorrect JvmName annotation arguments</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74443"><code>KT-74443</code></a> Compilation peer collector ignores inline property accessors</li> </ul> <h3>Analysis API. FIR</h3> <h4>New Features</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-73493"><code>KT-73493</code></a> Support context parameters</li> </ul> <h4>Performance Improvements</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-75790"><code>KT-75790</code></a> Experiment with increasing DEFAULT_LOCKING_INTERVAL time</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-72159"><code>KT-72159</code></a> LLFirCompilerRequiredAnnotationsTargetResolver: consider rewriting it to use honest jumping locks</li> </ul> <h4>Fixes</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-76331"><code>KT-76331</code></a> Cleanup FileStructureElement for classes</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73117"><code>KT-73117</code></a> K2 AA: Exception &quot;Setter is not found&quot; when val has a setter without body</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76540"><code>KT-76540</code></a> K2: Missing library dependency on Android SDK from androidx.activity-1.8.2 causes LiveEdit failures</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-73266"><code>KT-73266</code></a> K2. &quot;Declaration should have non-local container&quot; with unclosed annotation on top-level function</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76432"><code>KT-76432</code></a> JavaClassUseSiteMemberScope: Expected FirResolvedTypeRef with ConeKotlinType but was FirUserTypeRefImpl</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76217"><code>KT-76217</code></a> K2 AA: &quot;No fir element was found for KtParameter&quot; with multiple context parameter lists</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-74740"><code>KT-74740</code></a> Highlighting is broken after the built-in serialization refactoring</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76366"><code>KT-76366</code></a> ContextCollector: annotations on class members don't have the class as implicit receiver</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76352"><code>KT-76352</code></a> ContextCollector: wrong class annotation context in BODY mode</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76341"><code>KT-76341</code></a> ContextCollector: support dangling modifiers</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76332"><code>KT-76332</code></a> &quot;Declaration should have non-local container&quot; for declaration inside file annotation</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76115"><code>KT-76115</code></a> Disable <code>FirElementBuilder#getFirForElementInsideAnnotations</code> optimization for files, classes and scripts</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76347"><code>KT-76347</code></a> ContextCollector: avoid resolution for enum entry annotations</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-76272"><code>KT-76272</code></a> Cleanup AbstractFileStructureTest</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-75542"><code>KT-75542</code></a> K2 AA: &quot;FirDeclaration was not found for class KtNamedFunction, fir is class FirErrorExpressionImpl&quot; for unclosed annotation on member function</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/JetBrains/kotlin/commit/631e9fdbe59cc92ac1e88e6ff3bbf4418b3ab9da"><code>631e9fd</code></a> Add ChangeLog for 2.2.0-RC3</li> <li><a href="https://github.com/JetBrains/kotlin/commit/f4ff47fd7b8c0da31b28bc294baf22d49fb3c4ab"><code>f4ff47f</code></a> [Accessors] Correctly create arguments for accessors</li> <li><a href="https://github.com/JetBrains/kotlin/commit/4086c4b53e939e218e8000443ae37041af27d662"><code>4086c4b</code></a> [Gradle] Apply Dokka versioning plugin also to leaf partial html</li> <li><a href="https://github.com/JetBrains/kotlin/commit/a8a8e06d0cac0848f90ed2e3ef43a5a3e1290887"><code>a8a8e06</code></a> [JS] Fix getting names of local delegated properties</li> <li><a href="https://github.com/JetBrains/kotlin/commit/3b804bc2887e4c82ccaef7f2fc8a937dfed045e1"><code>3b804bc</code></a> [JS] Introduce the <code>JsNoLifting</code> annotation class</li> <li><a href="https://github.com/JetBrains/kotlin/commit/e690a3aedc808388b699fd4cea5cc2b3924b2dc4"><code>e690a3a</code></a> [test] Add a reproducer for KT-78073</li> <li><a href="https://github.com/JetBrains/kotlin/commit/0f85940a8e1973bb5b66145f75daf5a5316f3f00"><code>0f85940</code></a> [FIR] Fix collection of DSL markers from function types</li> <li><a href="https://github.com/JetBrains/kotlin/commit/726a9d7cf25c4ff9048bb1c95d72e1a570422704"><code>726a9d7</code></a> [Tests] Reproduce #KT-77301</li> <li><a href="https://github.com/JetBrains/kotlin/commit/a6aed74343dcdc4cf97329ba16e5976132d5d8bb"><code>a6aed74</code></a> Add ChangeLog for 2.2.0-RC2</li> <li><a href="https://github.com/JetBrains/kotlin/commit/2293f5ffeb1c19d8b3d3e68ee98c854d3f23b86e"><code>2293f5f</code></a> CLI: Follow symbolic links of content roots</li> <li>Additional commits viewable in <a href="https://github.com/JetBrains/kotlin/compare/v2.1.21...v2.2.0">compare view</a></li> </ul> </details> <br /> Updates `org.jlleitschuh.gradle:ktlint-gradle` from 12.3.+ to 13.0.0 Updates `org.jetbrains.kotlin.android` from 2.1.+ to 2.2.0 Updates `org.jlleitschuh.gradle.ktlint` from 12.3.+ to 13.0.0 <details> <summary>Most Recent Ignore Conditions Applied to This Pull Request</summary> | Dependency Name | Ignore Conditions | | --- | --- | | com.android.tools.build:gradle | [>= 8.7.a, < 8.8] | </details> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 9983200 commit 72d2325

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

‎android/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = "com.github.josxha.maplibre"
22
version = "1.0-SNAPSHOT"
33

44
buildscript {
5-
ext.kotlin_version = "2.1.21"
5+
ext.kotlin_version = "2.2.0"
66
repositories {
77
google()
88
mavenCentral()
@@ -12,10 +12,10 @@ buildscript {
1212
}
1313

1414
dependencies {
15-
classpath("com.android.tools.build:gradle:8.10.1")
15+
classpath("com.android.tools.build:gradle:8.11.1")
1616
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1717
// noinspection GradleDynamicVersion
18-
classpath("org.jlleitschuh.gradle:ktlint-gradle:12.3.+")
18+
classpath("org.jlleitschuh.gradle:ktlint-gradle:13.0.+")
1919
}
2020
}
2121

‎example/android/settings.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ plugins {
2222
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
2323
id("com.android.application") version "8.6.+" apply false
2424
// Use a Kotlin version that is compatible with MapLibre
25-
id("org.jetbrains.kotlin.android") version "2.1.+" apply false
26-
id("org.jlleitschuh.gradle.ktlint") version "12.3.+" apply false
25+
id("org.jetbrains.kotlin.android") version "2.2.+" apply false
26+
id("org.jlleitschuh.gradle.ktlint") version "13.0.+" apply false
2727
}
2828

2929
include(":app")

0 commit comments

Comments
 (0)