diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 09c7bc689..8528cd0d4 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -205,7 +205,7 @@ dependencies { implementation("com.google.code.gson:gson:2.8.6") implementation("com.google.android.material:material:1.3.0") implementation("androidx.annotation:annotation:1.1.0") - implementation("androidx.constraintlayout:constraintlayout:2.0.4") + implementation("androidx.constraintlayout:constraintlayout:2.1.0-beta01") implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") implementation("androidx.preference:preference:1.1.1") implementation("com.jakewharton.timber:timber:4.7.1") diff --git a/app/licenses.yml b/app/licenses.yml index 612b3b1e6..efbf46599 100644 --- a/app/licenses.yml +++ b/app/licenses.yml @@ -355,12 +355,6 @@ copyrightHolder: Google Inc. license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt -- artifact: androidx.constraintlayout:constraintlayout-solver:+ - name: Android ConstraintLayout Solver - copyrightHolder: Android Open Source Project - license: The Apache Software License, Version 2.0 - licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt - url: http://tools.android.com - artifact: org.jetbrains.kotlin:kotlin-stdlib:+ name: org.jetbrains.kotlin:kotlin-stdlib copyrightHolder: JetBrains s.r.o. @@ -944,3 +938,9 @@ license: The Apache Software License, Version 2.0 licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt url: https://github.com/material-components/material-components-android-compose-theme-adapter/ +- artifact: androidx.constraintlayout:constraintlayout-core:+ + name: constraintlayout-core + copyrightHolder: Android Open Source Project + license: The Apache Software License, Version 2.0 + licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt + url: http://tools.android.com diff --git a/app/src/main/assets/licenses.json b/app/src/main/assets/licenses.json index e1001f857..a11eca5e5 100644 --- a/app/src/main/assets/licenses.json +++ b/app/src/main/assets/licenses.json @@ -844,20 +844,6 @@ "normalizedLicense": "apache2", "libraryName": "Google APIs Client Library for Java" }, - { - "artifactId": { - "name": "constraintlayout-solver", - "group": "androidx.constraintlayout", - "version": "+" - }, - "copyrightHolder": "Android Open Source Project", - "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", - "license": "The Apache Software License, Version 2.0", - "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", - "normalizedLicense": "apache2", - "url": "http://tools.android.com", - "libraryName": "Android ConstraintLayout Solver" - }, { "artifactId": { "name": "kotlin-stdlib", @@ -2243,6 +2229,20 @@ "normalizedLicense": "apache2", "url": "https://github.com/material-components/material-components-android-compose-theme-adapter/", "libraryName": "compose-theme-adapter" + }, + { + "artifactId": { + "name": "constraintlayout-core", + "group": "androidx.constraintlayout", + "version": "+" + }, + "copyrightHolder": "Android Open Source Project", + "copyrightStatement": "Copyright © Android Open Source Project. All rights reserved.", + "license": "The Apache Software License, Version 2.0", + "licenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt", + "normalizedLicense": "apache2", + "url": "http://tools.android.com", + "libraryName": "constraintlayout-core" } ] } \ No newline at end of file diff --git a/deps_fdroid.txt b/deps_fdroid.txt index df2fb64de..ecc9b9dea 100644 --- a/deps_fdroid.txt +++ b/deps_fdroid.txt @@ -173,10 +173,10 @@ +| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.0.4 ++| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta01 +| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-beta01 (*) -+| | | +--- androidx.core:core:1.3.1 -> 1.5.0-beta01 (*) -+| | | \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 ++| | | +--- androidx.core:core:1.3.2 -> 1.5.0-beta01 (*) ++| | | \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta01 +| | +--- androidx.core:core:1.2.0 -> 1.5.0-beta01 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 +| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) @@ -313,7 +313,7 @@ ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -++--- androidx.constraintlayout:constraintlayout:2.0.4 (*) +++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) diff --git a/deps_googleplay.txt b/deps_googleplay.txt index d24ebd8d3..804cc66ca 100644 --- a/deps_googleplay.txt +++ b/deps_googleplay.txt @@ -296,10 +296,10 @@ +| | | +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*) +| | | +--- androidx.customview:customview:1.0.0 (*) +| | | \--- androidx.collection:collection:1.0.0 -> 1.1.0 (*) -+| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.0.4 ++| | +--- androidx.constraintlayout:constraintlayout:2.0.1 -> 2.1.0-beta01 +| | | +--- androidx.appcompat:appcompat:1.2.0 -> 1.3.0-beta01 (*) -+| | | +--- androidx.core:core:1.3.1 -> 1.5.0-beta01 (*) -+| | | \--- androidx.constraintlayout:constraintlayout-solver:2.0.4 ++| | | +--- androidx.core:core:1.3.2 -> 1.5.0-beta01 (*) ++| | | \--- androidx.constraintlayout:constraintlayout-core:1.0.0-beta01 +| | +--- androidx.core:core:1.2.0 -> 1.5.0-beta01 (*) +| | +--- androidx.dynamicanimation:dynamicanimation:1.0.0 +| | | +--- androidx.core:core:1.0.0 -> 1.5.0-beta01 (*) @@ -427,7 +427,7 @@ ++--- com.google.code.gson:gson:2.8.6 ++--- com.google.android.material:material:1.3.0 (*) ++--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 -++--- androidx.constraintlayout:constraintlayout:2.0.4 (*) +++--- androidx.constraintlayout:constraintlayout:2.1.0-beta01 (*) ++--- androidx.swiperefreshlayout:swiperefreshlayout:1.1.0 +| +--- androidx.annotation:annotation:1.1.0 -> 1.2.0-beta01 +| +--- androidx.core:core:1.1.0 -> 1.5.0-beta01 (*)