diff options
| author | Albin <albin@mullvad.net> | 2023-03-14 14:22:18 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-03-20 16:21:22 +0100 |
| commit | 0ca325d3f100c449dd8f649479cc33396457b871 (patch) | |
| tree | da4efe1c51814b9936d06d3a72ceb4c76cd4fecb | |
| parent | f5ee71fe171d4497d34bc56e1cda950e3a9f7549 (diff) | |
| download | mullvadvpn-0ca325d3f100c449dd8f649479cc33396457b871.tar.xz mullvadvpn-0ca325d3f100c449dd8f649479cc33396457b871.zip | |
Add compose dependencies
| -rw-r--r-- | android/app/build.gradle.kts | 3 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Dependencies.kt | 4 | ||||
| -rw-r--r-- | android/buildSrc/src/main/kotlin/Versions.kt | 2 | ||||
| -rw-r--r-- | android/gradle/verification-metadata.xml | 73 |
4 files changed, 67 insertions, 15 deletions
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index 02cb680b08..46b70c0607 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -206,12 +206,15 @@ dependencies { implementation(Dependencies.AndroidX.lifecycleRuntimeKtx) implementation(Dependencies.AndroidX.lifecycleViewmodelKtx) implementation(Dependencies.AndroidX.recyclerview) + implementation(Dependencies.Compose.composeCollapsingToolbar) implementation(Dependencies.Compose.constrainLayout) implementation(Dependencies.Compose.foundation) implementation(Dependencies.Compose.viewModelLifecycle) implementation(Dependencies.Compose.material) + implementation(Dependencies.Compose.material3) implementation(Dependencies.Compose.uiController) implementation(Dependencies.Compose.ui) + implementation(Dependencies.Compose.uiUtil) implementation(Dependencies.jodaTime) implementation(Dependencies.Koin.core) implementation(Dependencies.Koin.coreExt) diff --git a/android/buildSrc/src/main/kotlin/Dependencies.kt b/android/buildSrc/src/main/kotlin/Dependencies.kt index 4a99bbc0bc..de1be2d9b7 100644 --- a/android/buildSrc/src/main/kotlin/Dependencies.kt +++ b/android/buildSrc/src/main/kotlin/Dependencies.kt @@ -43,6 +43,8 @@ object Dependencies { } object Compose { + const val composeCollapsingToolbar = + "me.onebone:toolbar-compose:${Versions.Compose.composeCollapsingToolbar}" const val constrainLayout = "androidx.constraintlayout:constraintlayout-compose:${Versions.Compose.constrainLayout}" const val foundation = @@ -51,10 +53,12 @@ object Dependencies { const val viewModelLifecycle = "androidx.lifecycle:lifecycle-viewmodel-compose:${Versions.Compose.viewModelLifecycle}" const val material = "androidx.compose.material:material:${Versions.Compose.material}" + const val material3 = "androidx.compose.material3:material3:${Versions.Compose.material3}" const val testManifest = "androidx.compose.ui:ui-test-manifest:${Versions.Compose.base}" const val uiController = "com.google.accompanist:accompanist-systemuicontroller:${Versions.Compose.uiController}" const val ui = "androidx.compose.ui:ui:${Versions.Compose.base}" + const val uiUtil = "androidx.compose.ui:ui-util:${Versions.Compose.base}" const val uiTooling = "androidx.compose.ui:ui-tooling:${Versions.Compose.base}" const val uiToolingPreview = "androidx.compose.ui:ui-tooling-preview:${Versions.Compose.base}" diff --git a/android/buildSrc/src/main/kotlin/Versions.kt b/android/buildSrc/src/main/kotlin/Versions.kt index 35bc19d1bb..b786f40d3c 100644 --- a/android/buildSrc/src/main/kotlin/Versions.kt +++ b/android/buildSrc/src/main/kotlin/Versions.kt @@ -39,9 +39,11 @@ object Versions { object Compose { const val base = "1.3.2" + const val composeCollapsingToolbar = "2.3.5" const val constrainLayout = "1.0.1" const val foundation = "1.3.1" const val material = "1.3.1" + const val material3 = "1.0.1" const val uiController = "0.28.0" const val viewModelLifecycle = "2.5.1" } diff --git a/android/gradle/verification-metadata.xml b/android/gradle/verification-metadata.xml index f684f65b10..e0bf7583a8 100644 --- a/android/gradle/verification-metadata.xml +++ b/android/gradle/verification-metadata.xml @@ -171,6 +171,14 @@ <sha256 value="078b4dcd5f09689281415d9ea0e09d2775d80f016041dacbcee22d54c43a5fa1" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.animation" name="animation" version="1.3.0"> + <artifact name="animation-1.3.0.aar"> + <sha256 value="3b640dc729a7686bedeb33061e38a10294f495bb0040aeaaa970ae1560119f41" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-1.3.0.module"> + <sha256 value="c4e548544f21d977ef7a80aeb8e388feb628c6bbf9099325559bbd8adb6992d0" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.animation" name="animation" version="1.3.2"> <artifact name="animation-1.3.2.aar"> <sha256 value="7c52b01c26c9ab8946d4cb6bbf819a54ac48038e1a3e741d30a6beac5457547f" origin="Generated by Gradle"/> @@ -192,6 +200,14 @@ <sha256 value="6834b1b466930369a6cb9f76df6257eff28428e42ef42a26515319638cceee3d" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.animation" name="animation-core" version="1.3.0"> + <artifact name="animation-core-1.3.0.aar"> + <sha256 value="bfd9839872589c9d409e4eb943c9055d929c06f0673a3ed186b40645eba8e68f" origin="Generated by Gradle"/> + </artifact> + <artifact name="animation-core-1.3.0.module"> + <sha256 value="56c39013b7c99ccd0339badfef4452972d412dcd9862447ebf0788cde77eb698" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.animation" name="animation-core" version="1.3.2"> <artifact name="animation-core-1.3.2.aar"> <sha256 value="68cd10277608095d2f365b31945b640815f8e98fb53a17b84dc85fe2e52a70cf" origin="Generated by Gradle"/> @@ -256,6 +272,14 @@ <sha256 value="2d89e99ae979853bd2359a7d5da16405479bce776d176168c2c7e8b431398d80" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.material3" name="material3" version="1.0.1"> + <artifact name="material3-1.0.1.aar"> + <sha256 value="7204378ecadec4089da57492fbdb4cb637758e4bc740f26fe6f2db4d8876af05" origin="Generated by Gradle"/> + </artifact> + <artifact name="material3-1.0.1.module"> + <sha256 value="993a826a5cb89f2932d7e0d9dc2dc071c7b6f684420f93b304bd07ddbbfb902b" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.runtime" name="runtime" version="1.1.1"> <artifact name="runtime-1.1.1.module"> <sha256 value="b7e9c3cc6034d099c9160ef49d2dc03eac66d3fe7ea0df7aa0abfa258368de63" origin="Generated by Gradle"/> @@ -298,6 +322,11 @@ <sha256 value="ad2262144f81040a09bfdec039010dca2cb5026821e4b27403519303b59ae7bf" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.ui" name="ui-graphics" version="1.0.1"> + <artifact name="ui-graphics-1.0.1.module"> + <sha256 value="ad9ce40deec721b8988c43ab847d803d00bee88c67cfc838dee565691f35db95" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.ui" name="ui-graphics" version="1.1.1"> <artifact name="ui-graphics-1.1.1.module"> <sha256 value="170b229a8012c6724b4101058dc4c2cfe0f11e78a34aac4a4627cce8888f1a59" origin="Generated by Gradle"/> @@ -345,6 +374,11 @@ <sha256 value="1b74b6a3275e3bd794a21b6403247455cc3c3978ade66dba214035d9fbabab2d" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.ui" name="ui-text" version="1.3.1"> + <artifact name="ui-text-1.3.1.module"> + <sha256 value="7808e6a9bb1ebd8b208b0ab3b206ddc5d4254ace63657d636b463b71983c54d3" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.ui" name="ui-text" version="1.3.2"> <artifact name="ui-text-1.3.2.aar"> <sha256 value="988fe4ea7f042ab83073a65a4448f2a0b8593b95b27d8708c41745af5aa10e00" origin="Generated by Gradle"/> @@ -353,6 +387,14 @@ <sha256 value="9934a053e86e4847f7bc3c60be46187c9834d7815c27f12a369905170fc08d3e" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.ui" name="ui-tooling" version="1.3.0"> + <artifact name="ui-tooling-1.3.0.aar"> + <sha256 value="67d511e5b9c4251cd5d1c7129618738e24765446a367eed18e8d0abba4ef3413" origin="Generated by Gradle"/> + </artifact> + <artifact name="ui-tooling-1.3.0.module"> + <sha256 value="f367f5f746b14e8fb3d7371c5e012a1f922c27de33927a350985043cab3039e9" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.ui" name="ui-tooling" version="1.3.2"> <artifact name="ui-tooling-1.3.2.aar"> <sha256 value="e9fcb88bb28ee67b2ef8d8d995ffd94caafbeb619a6cd09e391857867a17ce5b" origin="Generated by Gradle"/> @@ -361,6 +403,14 @@ <sha256 value="5922f4576b36c7fa8be7d9d1d229376b20d5ef25a3410185e8562baad43d1788" origin="Generated by Gradle"/> </artifact> </component> + <component group="androidx.compose.ui" name="ui-tooling-data" version="1.3.0"> + <artifact name="ui-tooling-data-1.3.0.aar"> + <sha256 value="98a9c11622fa3abeaf881cfef2e0f4ab6d2ccdcb7ea9d7d27297b8597184e17f" origin="Generated by Gradle"/> + </artifact> + <artifact name="ui-tooling-data-1.3.0.module"> + <sha256 value="770acffe3600f98be1f18f967842bf86a7e0b20fa431d66d4ad7ba038192bc60" origin="Generated by Gradle"/> + </artifact> + </component> <component group="androidx.compose.ui" name="ui-tooling-data" version="1.3.2"> <artifact name="ui-tooling-data-1.3.2.aar"> <sha256 value="a60c7c89e0461660b657c4502894266c089c10c017eee4e21078a31e46d9b6d8" origin="Generated by Gradle"/> @@ -390,11 +440,6 @@ <sha256 value="eecb5446872b5cd3caa1acce0e704780d1a3fa9feb2f06c6728ef9fb231b4cb5" origin="Generated by Gradle"/> </artifact> </component> - <component group="androidx.compose.ui" name="ui-util" version="1.0.0"> - <artifact name="ui-util-1.0.0.module"> - <sha256 value="a09871728e5a9d050d2fdcb99a875ef2120dc6deea808f5a6d443dd887e081ca" origin="Generated by Gradle"/> - </artifact> - </component> <component group="androidx.compose.ui" name="ui-util" version="1.3.2"> <artifact name="ui-util-1.3.2.aar"> <sha256 value="b2f15225c1f59482445b1bc59a6dcb067cee62edaa611140aeaf27587bf41077" origin="Generated by Gradle"/> @@ -2304,6 +2349,14 @@ <sha256 value="8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3" origin="Generated by Gradle"/> </artifact> </component> + <component group="me.onebone" name="toolbar-compose" version="2.3.5"> + <artifact name="toolbar-compose-2.3.5.aar"> + <sha256 value="5454801b0407039f58406626d387e8abb8cc8f888efe498644d89b8d4a33f1b1" origin="Generated by Gradle"/> + </artifact> + <artifact name="toolbar-compose-2.3.5.module"> + <sha256 value="12cfcb37f4d8d5414eb405271681e9805a1085b5ad794356088f369ebb9c9b87" origin="Generated by Gradle"/> + </artifact> + </component> <component group="net.bytebuddy" name="byte-buddy" version="1.12.18"> <artifact name="byte-buddy-1.12.18.jar"> <sha256 value="39200c13a72b6a3f4ec43c7b6d2fb78ecbeb25c29e986f4efa572636b39d750e" origin="Generated by Gradle"/> @@ -2915,11 +2968,6 @@ <sha256 value="2aedcdc6b69b33bdf5cc235bcea88e7cf6601146bb6bcdffdb312bbacd7be261" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk7" version="1.6.21"> - <artifact name="kotlin-stdlib-jdk7-1.6.21.jar"> - <sha256 value="f1b0634dbb94172038463020bb2dd45ca26849f8ce29d625acb0f1569d11dbee" 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"> <sha256 value="54f61351b1936ad88f4e53059fe781e723eae51d78ed9e7422d8b403574ec682" origin="Generated by Gradle"/> @@ -2940,11 +2988,6 @@ <sha256 value="1456d82d039ea30d8485b032901f52bbf07e7cdbe8bb1f8708ad32a8574c41ce" origin="Generated by Gradle"/> </artifact> </component> - <component group="org.jetbrains.kotlin" name="kotlin-stdlib-jdk8" version="1.6.21"> - <artifact name="kotlin-stdlib-jdk8-1.6.21.jar"> - <sha256 value="dab45489b47736d59fce44b80676f1947a9b6bcab10fd60e878a83bd82a6954c" 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"> <sha256 value="8aafdd60c94f454c92e5066d266a5ed53ecc63c78f623b3fd9db56fea4032873" origin="Generated by Gradle"/> |
