Skip to content

Commit 6191020

Browse files
committed
Merge branch 'develop'
2 parents aaf7520 + f4a375a commit 6191020

File tree

5 files changed

+17
-11
lines changed

5 files changed

+17
-11
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ buildscript {
88
}
99
dependencies {
1010
classpath 'com.android.tools.build:gradle:3.2.1'
11-
classpath 'io.realm:realm-gradle-plugin:5.7.0'
11+
classpath 'io.realm:realm-gradle-plugin:5.8.0'
1212

1313
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
1414

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ org.gradle.jvmargs=-Xmx1536m
1010
# When configured, Gradle will run in incubating parallel mode.
1111
# This option should only be used with decoupled projects. More details, visit
1212
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13-
org.gradle.parallel=true
13+
org.gradle.parallel=true
14+
android.enableBuildCache=true
15+
org.gradle.configureondemand=true

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

qasdk/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ dependencies {
2727
implementation fileTree(dir: 'libs', include: ['*.jar'])
2828

2929
api 'io.reactivex.rxjava2:rxjava:2.2.0'
30-
api 'com.squareup.retrofit2:retrofit:2.4.0'
31-
api 'com.squareup.retrofit2:converter-gson:2.4.0'
32-
api 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
33-
api 'com.squareup.okhttp3:logging-interceptor:3.11.0'
30+
api 'com.squareup.retrofit2:retrofit:2.5.0'
31+
api 'com.squareup.retrofit2:converter-gson:2.5.0'
32+
api 'com.squareup.retrofit2:adapter-rxjava2:2.5.0'
33+
api 'com.squareup.okhttp3:logging-interceptor:3.12.0'
3434
api 'com.jakewharton.timber:timber:4.7.1'
3535

3636
// Upload Service

sample/build.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ android {
1717
applicationIdSuffix ".beta"
1818
buildConfigField "boolean", "BETA", "true"
1919
buildConfigField("String", "API_URL", '"http://beta.astrnt.co/api/"')
20-
buildConfigField("int", "SDK_VERSION", "111")
20+
buildConfigField("int", "SDK_VERSION", "120")
2121
resValue "string", "app_name", "BETA Q&A SDK Sample"
2222
}
2323
live {
2424
dimension "mode"
2525
buildConfigField "boolean", "BETA", "false"
2626
buildConfigField("String", "API_URL", '"http://app.astrnt.co/api/"')
27-
buildConfigField("int", "SDK_VERSION", "111")
27+
buildConfigField("int", "SDK_VERSION", "120")
2828
resValue "string", "app_name", "Q&A SDK Sample"
2929
}
3030
}
@@ -35,17 +35,21 @@ android {
3535
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3636
}
3737
}
38+
compileOptions {
39+
sourceCompatibility JavaVersion.VERSION_1_8
40+
targetCompatibility JavaVersion.VERSION_1_8
41+
}
3842
}
3943

4044
dependencies {
4145
implementation project(':qasdk')
4246
// implementation 'com.github.astrnt:qa-sdk-android:1.5'
4347
implementation 'io.reactivex.rxjava2:rxandroid:2.1.0'
4448
implementation fileTree(dir: 'libs', include: ['*.jar'])
45-
implementation 'com.android.support:appcompat-v7:27.1.1'
49+
implementation 'com.android.support:appcompat-v7:28.0.0'
4650

4751
// Camera View
48-
implementation 'com.github.derohimat:CameraView:1.6.6'
52+
implementation 'com.github.derohimat:CameraView:1.7.2'
4953

5054
//RxPermission for easy runtime permission management
5155
implementation 'com.github.tbruyelle:rxpermissions:0.10.2'

0 commit comments

Comments
 (0)