diff options
| author | Allan Wang <me@allanwang.ca> | 2021-11-18 14:32:08 -0800 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2021-11-18 14:32:08 -0800 |
| commit | 5662e6f483b93a07f01c352786462406e4d54f4f (patch) | |
| tree | 105200d606ab7b5fe928f557976e214092a04212 /buildSrc/src/main/kotlin/Versions.kt | |
| parent | 68397505810095136cac25382d93ca9b910d38c9 (diff) | |
| parent | ab7447c811808568cc7367eef3149aead2d990b3 (diff) | |
| download | frost-5662e6f483b93a07f01c352786462406e4d54f4f.tar.gz frost-5662e6f483b93a07f01c352786462406e4d54f4f.tar.bz2 frost-5662e6f483b93a07f01c352786462406e4d54f4f.zip | |
Fix merge conflicts
Diffstat (limited to 'buildSrc/src/main/kotlin/Versions.kt')
| -rw-r--r-- | buildSrc/src/main/kotlin/Versions.kt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index e33e32df..5c68a01d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,6 +1,6 @@ object Versions { - const val targetSdk = 30 + const val targetSdk = 31 // https://developer.android.com/jetpack/androidx/releases/biometric const val andxBiometric = "1.1.0" @@ -18,9 +18,9 @@ object Versions { // https://developer.android.com/jetpack/androidx/releases/room const val room = "2.3.0" // http://robolectric.org/getting-started/ - const val roboelectric = "4.4" + const val roboelectric = "4.6" // https://github.com/davemorrissey/subsampling-scale-image-view#quick-start const val scaleImageView = "3.10.0" // https://github.com/node-gradle/gradle-node-plugin/releases - const val nodeGradle = "3.0.1" + const val nodeGradle = "3.1.1" }
\ No newline at end of file |