Skip to content

[Crane] Update to 7033025 snapshot #316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JolandaVerhoef merged 10 commits into from
Dec 16, 2020
Merged

[Crane] Update to 7033025 snapshot #316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
119df1d
Updates Crane to 7001724 snapshot
Dec 11, 2020
cf7173a
Removes unused import
Dec 11, 2020
14f883f
[Crane] Updates to 7024175 snapshot
Dec 11, 2020
882e0b4
[Crane] Update to snapshot 7033025
JolandaVerhoef Dec 15, 2020
77c7e37
[Crane] Spotless fixes
JolandaVerhoef Dec 15, 2020
357372c
[Crane] Update dependencies
JolandaVerhoef Dec 15, 2020
3278466
[Crane] Fix tests
JolandaVerhoef Dec 16, 2020
52c1990
Merge branch 'dev_alpha09' into mv/crane_alpha09
JolandaVerhoef Dec 16, 2020
c57d56f
Merge branch 'dev_alpha09' into mv/crane_alpha09
JolandaVerhoef Dec 16, 2020
c798188
Merge branch 'dev_alpha09' into mv/crane_alpha09
JolandaVerhoef Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Crane] Update dependencies
  • Loading branch information
@JolandaVerhoef
JolandaVerhoef committed Dec 15, 2020
commit 357372cae45e45eb775d5637f855deb4d91c61c0
2 changes: 1 addition & 1 deletion Crane/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildscript {
}

plugins {
id 'com.diffplug.spotless' version '5.7.0'
id 'com.diffplug.spotless' version '5.8.2'
}

subprojects {
Expand Down
6 changes: 3 additions & 3 deletions Crane/buildSrc/src/main/java/com/example/crane/buildsrc/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
package com.example.crane.buildsrc

object Versions {
const val ktLint = "0.39.0"
const val ktLint = "0.40.0"
}

object Libs {
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha02"
const val androidGradlePlugin = "com.android.tools.build:gradle:7.0.0-alpha03"
const val ktLint = "com.pinterest:ktlint:${Versions.ktLint}"

object GoogleMaps {
Expand All @@ -35,7 +35,7 @@ object Libs {
}

object Kotlin {
private const val version = "1.4.20"
private const val version = "1.4.21"
const val stdlib = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$version"
const val gradlePlugin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$version"
const val extensions = "org.jetbrains.kotlin:kotlin-android-extensions:$version"
Expand Down
2 changes: 1 addition & 1 deletion Crane/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Oct 23 09:30:32 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME