mirror of
https://github.com/ankidroid/Anki-Android.git
synced 2024-09-19 19:42:17 +02:00
Dependency updates 20240111 (#15204)
* build(deps): bump androidx.test.uiautomator:uiautomator Bumps androidx.test.uiautomator:uiautomator from 2.3.0-alpha05 to 2.3.0-beta01. --- updated-dependencies: - dependency-name: androidx.test.uiautomator:uiautomator dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump kotlin_version from 1.9.21 to 1.9.22 Bumps `kotlin_version` from 1.9.21 to 1.9.22. Updates `org.jetbrains.kotlin.jvm` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin.android` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin.plugin.parcelize` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin.plugin.serialization` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-reflect` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-test` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-test-junit5` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) Updates `org.jetbrains.kotlin:kotlin-test-junit` from 1.9.21 to 1.9.22 - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/compare/v1.9.21...v1.9.22) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin.jvm dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.android dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.plugin.parcelize dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin.plugin.serialization dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-reflect dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit5 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.jetbrains.kotlin:kotlin-test-junit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump com.github.ByteHamster:SearchPreference Bumps com.github.ByteHamster:SearchPreference from 2.4.0 to 2.5.0. --- updated-dependencies: - dependency-name: com.github.ByteHamster:SearchPreference dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump org.jsoup:jsoup from 1.17.1 to 1.17.2 Bumps [org.jsoup:jsoup](https://github.com/jhy/jsoup) from 1.17.1 to 1.17.2. - [Release notes](https://github.com/jhy/jsoup/releases) - [Changelog](https://github.com/jhy/jsoup/blob/master/CHANGES.md) - [Commits](https://github.com/jhy/jsoup/compare/jsoup-1.17.1...jsoup-1.17.2) --- updated-dependencies: - dependency-name: org.jsoup:jsoup dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump com.squareup.leakcanary:leakcanary-android Bumps [com.squareup.leakcanary:leakcanary-android](https://github.com/square/leakcanary) from 2.12 to 2.13. - [Release notes](https://github.com/square/leakcanary/releases) - [Changelog](https://github.com/square/leakcanary/blob/v2.13/docs/changelog.md) - [Commits](https://github.com/square/leakcanary/compare/v2.12...v2.13) --- updated-dependencies: - dependency-name: com.squareup.leakcanary:leakcanary-android dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump io.mockk:mockk from 1.13.8 to 1.13.9 Bumps [io.mockk:mockk](https://github.com/mockk/mockk) from 1.13.8 to 1.13.9. - [Release notes](https://github.com/mockk/mockk/releases) - [Commits](https://github.com/mockk/mockk/compare/1.13.8...1.13.9) --- updated-dependencies: - dependency-name: io.mockk:mockk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump org.apache.commons:commons-exec from 1.3 to 1.4.0 Bumps org.apache.commons:commons-exec from 1.3 to 1.4.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-exec dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): bump com.google.protobuf:protobuf-kotlin-lite Bumps com.google.protobuf:protobuf-kotlin-lite from 3.25.1 to 3.25.2. --- updated-dependencies: - dependency-name: com.google.protobuf:protobuf-kotlin-lite dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): adopt android gradle plugin 8.2.1 note that the android gradle plugin 8.2-stable series has a defect that does not allow setting the jacoco version, and pins it at 0.8.8 that is fine in all cases except where you want to use JDK21, which requires jacoco 0.8.11+. this will be resolved in android gradle plugin 8.3-stable * chore(deps): bump com.github.zafarkhaja:java-semver from 0.9.0 to 0.10.0 (#15200) * chore(deps): bump com.github.zafarkhaja:java-semver from 0.9.0 to 0.10.0 Bumps [com.github.zafarkhaja:java-semver](https://github.com/zafarkhaja/jsemver) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/zafarkhaja/jsemver/releases) - [Changelog](https://github.com/zafarkhaja/jsemver/blob/master/CHANGELOG.md) - [Commits](https://github.com/zafarkhaja/jsemver/compare/v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: com.github.zafarkhaja:java-semver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore: fix deprecations in new java semver package --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mike Hardy <github@mikehardy.net> * chore(deps): bump follow-redirects in /tools/localization Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.15.3 to 1.15.4. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.15.3...v1.15.4) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
Mike Hardy
GitHub
parent
bdff91ce43
commit
30ff2642a4
@ -326,7 +326,7 @@ dependencies {
|
||||
|
||||
// Backend libraries
|
||||
|
||||
implementation 'com.google.protobuf:protobuf-kotlin-lite:3.25.1' // This is required when loading from a file
|
||||
implementation 'com.google.protobuf:protobuf-kotlin-lite:3.25.2' // This is required when loading from a file
|
||||
|
||||
Properties localProperties = new Properties()
|
||||
if (project.rootProject.file('local.properties').exists()) {
|
||||
@ -355,19 +355,19 @@ dependencies {
|
||||
implementation 'com.squareup.okhttp3:okhttp:4.12.0'
|
||||
implementation 'com.arcao:slf4j-timber:3.1'
|
||||
implementation 'com.jakewharton.timber:timber:5.0.1'
|
||||
implementation 'org.jsoup:jsoup:1.17.1'
|
||||
implementation "com.github.zafarkhaja:java-semver:0.9.0" // For AnkiDroid JS API Versioning
|
||||
implementation 'org.jsoup:jsoup:1.17.2'
|
||||
implementation "com.github.zafarkhaja:java-semver:0.10.0" // For AnkiDroid JS API Versioning
|
||||
implementation 'com.drakeet.drawer:drawer:1.0.3'
|
||||
implementation 'uk.co.samuelwall:material-tap-target-prompt:3.3.2'
|
||||
implementation 'com.github.mrudultora:Colorpicker:1.2.0'
|
||||
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
||||
implementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
|
||||
implementation 'com.github.ByteHamster:SearchPreference:2.4.0'
|
||||
implementation 'com.github.ByteHamster:SearchPreference:2.5.0'
|
||||
|
||||
// Cannot use debugImplementation since classes need to be imported in AnkiDroidApp
|
||||
// and there's no no-op version for release build. Usage has been disabled for release
|
||||
// build via AnkiDroidApp.
|
||||
implementation 'com.squareup.leakcanary:leakcanary-android:2.12'
|
||||
implementation 'com.squareup.leakcanary:leakcanary-android:2.13'
|
||||
|
||||
// A path for a testing library which provide Parameterized Test
|
||||
testImplementation "org.junit.jupiter:junit-jupiter:$junit_version"
|
||||
@ -385,8 +385,8 @@ dependencies {
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
|
||||
testImplementation "org.jetbrains.kotlin:kotlin-test-junit5:$kotlin_version"
|
||||
testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version"
|
||||
testImplementation "io.mockk:mockk:1.13.8"
|
||||
testImplementation 'org.apache.commons:commons-exec:1.3' // obtaining the OS
|
||||
testImplementation "io.mockk:mockk:1.13.9"
|
||||
testImplementation 'org.apache.commons:commons-exec:1.4.0' // obtaining the OS
|
||||
testImplementation("androidx.fragment:fragment-testing:$fragments_version")
|
||||
// in a JvmTest we need org.json.JSONObject to not be mocked
|
||||
testImplementation 'org.json:json:20231013'
|
||||
|
||||
@ -132,8 +132,8 @@ open class AnkiDroidJsAPI(private val activity: AbstractFlashcardViewer) {
|
||||
}
|
||||
return false
|
||||
}
|
||||
val versionCurrent = Version.valueOf(AnkiDroidJsAPIConstants.sCurrentJsApiVersion)
|
||||
val versionSupplied = Version.valueOf(apiVer)
|
||||
val versionCurrent = Version.parse(AnkiDroidJsAPIConstants.sCurrentJsApiVersion)
|
||||
val versionSupplied = Version.parse(apiVer)
|
||||
|
||||
/*
|
||||
* if api major version equals to supplied major version then return true and also check for minor version and patch version
|
||||
@ -144,11 +144,11 @@ open class AnkiDroidJsAPI(private val activity: AbstractFlashcardViewer) {
|
||||
versionSupplied == versionCurrent -> {
|
||||
true
|
||||
}
|
||||
versionSupplied.lessThan(versionCurrent) -> {
|
||||
versionSupplied.isLowerThan(versionCurrent) -> {
|
||||
activity.runOnUiThread {
|
||||
activity.showSnackbar(context.getString(R.string.update_js_api_version, apiDevContact))
|
||||
}
|
||||
versionSupplied.greaterThanOrEqualTo(Version.valueOf(AnkiDroidJsAPIConstants.sMinimumJsApiVersion))
|
||||
versionSupplied.isHigherThanOrEquivalentTo(Version.parse(AnkiDroidJsAPIConstants.sMinimumJsApiVersion))
|
||||
}
|
||||
else -> {
|
||||
activity.runOnUiThread {
|
||||
|
||||
@ -6,7 +6,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilerExecutionStrategy
|
||||
buildscript {
|
||||
// The version for the Kotlin plugin and dependencies
|
||||
// If changing this, make sure to update org.jetbrains.kotlin.plugin.serialization version too
|
||||
ext.kotlin_version = '1.9.21'
|
||||
ext.kotlin_version = '1.9.22'
|
||||
ext.lint_version = '31.1.1'
|
||||
ext.acra_version = '5.11.3'
|
||||
ext.ankidroid_backend_version = '0.1.34-anki23.12.1'
|
||||
@ -18,9 +18,9 @@ buildscript {
|
||||
ext.androidx_test_version = '1.5.0'
|
||||
ext.androidx_test_junit_version = '1.1.5'
|
||||
ext.robolectric_version = '4.11.1'
|
||||
ext.android_gradle_plugin = "8.1.4"
|
||||
ext.android_gradle_plugin = "8.2.1"
|
||||
ext.dokka_version = "1.9.10" // not the same with kotlin version!
|
||||
ext.uiautomator_version = "2.3.0-alpha05"
|
||||
ext.uiautomator_version = "2.3.0-beta01"
|
||||
|
||||
configurations.configureEach {
|
||||
resolutionStrategy.eachDependency { details ->
|
||||
|
||||
@ -1845,9 +1845,9 @@ flatted@^3.2.9:
|
||||
integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
|
||||
|
||||
follow-redirects@^1.15.0:
|
||||
version "1.15.3"
|
||||
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
|
||||
integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
|
||||
version "1.15.4"
|
||||
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
|
||||
integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
|
||||
|
||||
for-each@^0.3.3:
|
||||
version "0.3.3"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user