Skip to content

Commit

Permalink
Merge pull request #110 from RADAR-base/release-1.0.8
Browse files Browse the repository at this point in the history
Release 1.0.8
  • Loading branch information
blootsvoets authored Nov 2, 2020
2 parents 158eab9 + d14ae70 commit c2506b8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
14 changes: 7 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ android {
applicationId 'org.radarcns.detail'
minSdkVersion 21
targetSdkVersion 29
versionCode 46
versionName '1.0.7'
versionCode 47
versionName '1.0.8'
manifestPlaceholders = ['appAuthRedirectScheme': 'org.radarbase.passive.app']
multiDexEnabled true
}
Expand Down Expand Up @@ -57,22 +57,22 @@ repositories {
maven { url 'https://repo.thehyve.nl/content/repositories/snapshots' }
}

ext.radarCommonsVersion = '1.0.1'
ext.radarCommonsVersion = '1.0.2'

dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api "org.radarbase:radar-commons-android:$radarCommonsVersion"

implementation "org.radarbase:radar-android-login-qr:$radarCommonsVersion"
implementation 'com.google.firebase:firebase-core:17.5.1'
implementation 'com.google.firebase:firebase-config:19.2.0'
implementation 'com.google.firebase:firebase-core:18.0.0'
implementation 'com.google.firebase:firebase-config:20.0.0'
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"

implementation 'org.slf4j:slf4j-api:1.7.30'

implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
implementation 'com.google.firebase:firebase-analytics:17.6.0'
implementation 'com.google.firebase:firebase-analytics:18.0.0'

implementation 'sk.baka.slf4j:slf4j-handroid:1.7.32'

Expand All @@ -88,7 +88,7 @@ dependencies {

implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
implementation 'androidx.constraintlayout:constraintlayout:2.0.3'

testImplementation 'junit:junit:4.13'
testRuntimeOnly 'org.slf4j:slf4j-simple:1.7.30'
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
android.enableJetifier=true

0 comments on commit c2506b8

Please sign in to comment.