Skip to content

Commit fd82ff2

Browse files
committed
release 4
release version 4.2 version code 4
1 parent 729190c commit fd82ff2

File tree

6 files changed

+473
-27
lines changed

6 files changed

+473
-27
lines changed

androidClient/app/build.gradle

Lines changed: 38 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,14 @@ android {
1010
applicationId "com.macbitsgoa.comrades"
1111
minSdkVersion 21
1212
targetSdkVersion 28
13-
versionCode 1
14-
versionName "1.0"
13+
versionCode 4
14+
versionName "1.2"
15+
javaCompileOptions {
16+
annotationProcessorOptions {
17+
arguments = ["room.schemaLocation":
18+
"$projectDir/schemas".toString()]
19+
}
20+
}
1521
}
1622
buildTypes {
1723
debug {
@@ -31,52 +37,62 @@ android {
3137
sourceCompatibility JavaVersion.VERSION_1_8
3238
targetCompatibility JavaVersion.VERSION_1_8
3339
}
40+
packagingOptions {
41+
exclude 'META-INF/proguard/androidx-annotations.pro'
42+
}
43+
lintOptions {
44+
abortOnError false
45+
}
3446
}
3547

3648
dependencies {
3749
implementation fileTree(include: ['*.jar'], dir: 'libs')
38-
implementation 'androidx.appcompat:appcompat:1.0.0-rc02'
39-
implementation 'androidx.legacy:legacy-support-v4:1.0.0-rc02'
50+
implementation 'androidx.appcompat:appcompat:1.0.0'
51+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
4052
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
41-
implementation 'com.google.android.material:material:1.0.0-rc02'
53+
implementation 'com.google.android.material:material:1.0.0'
4254
implementation 'pub.devrel:easypermissions:1.2.0'
43-
implementation('com.google.api-client:google-api-client-android:1.23.0') {
44-
exclude group: 'org.apache.httpcomponents'
45-
}
55+
implementation 'com.google.api-client:google-api-client-android:1.23.0'
4656
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
47-
implementation('com.google.apis:google-api-services-drive:v3-rev117-1.23.0') {
48-
exclude group: 'org.apache.httpcomponents'
49-
}
57+
implementation 'com.google.apis:google-api-services-drive:v3-rev117-1.23.0'
5058
implementation 'com.google.firebase:firebase-core:16.0.3'
5159
implementation 'com.google.firebase:firebase-database:16.0.2'
5260
implementation 'com.google.firebase:firebase-auth:16.0.3'
53-
implementation 'com.google.firebase:firebase-messaging:17.3.1'
61+
implementation 'com.google.firebase:firebase-messaging:17.3.2'
5462
implementation 'com.google.firebase:firebase-config:16.0.0'
5563
implementation 'com.google.android.gms:play-services-auth:16.0.0'
5664
implementation 'com.facebook.fresco:fresco:1.10.0'
5765
implementation 'com.squareup.okhttp:okhttp:2.7.5'
58-
def lifecycle_version = "2.0.0-rc01"
66+
def lifecycle_version = "2.0.0"
5967
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
6068
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
6169
def room_version = "2.0.0-rc01"
6270
implementation "androidx.room:room-runtime:$room_version"
63-
implementation 'com.android.support:design:28.0.0-rc02'
71+
kapt "androidx.room:room-compiler:$room_version" // use kapt for Kotlin
72+
// Test helpers
73+
testImplementation "androidx.room:room-testing:$room_version"
74+
75+
implementation 'com.google.android.material:material:1.0.0'
76+
implementation 'com.google.android.material:material:1.0.0'
6477
implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
65-
implementation "com.android.support:support-core-utils:28.1.1"
66-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
67-
implementation 'com.android.support:support-v4:28.0.0-rc02'
68-
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
69-
kapt "androidx.room:room-compiler:$room_version"
78+
implementation "androidx.legacy:legacy-support-core-utils:1.0.0"
79+
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
80+
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
81+
implementation 'androidx.appcompat:appcompat:1.0.0'
7082
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
7183
implementation 'com.google.code.gson:gson:2.8.5'
7284
implementation 'com.mikhaellopez:circularprogressbar:2.0.0'
7385
implementation 'com.github.chrisbanes:PhotoView:2.1.4'
7486
implementation 'com.squareup.picasso:picasso:2.71828'
7587
implementation 'com.github.apl-devs:appintro:v4.2.3'
76-
def work_version = "1.0.0-alpha08"
77-
implementation "android.arch.work:work-runtime:$work_version" // use -ktx for Kotlin
88+
def work_version = "1.0.0-alpha09"
89+
implementation ("android.arch.work:work-runtime-ktx:$work_version") {
90+
exclude group: 'com.google.guava', module: 'listenablefuture'
91+
}
7892
// optional - Firebase JobDispatcher support
79-
implementation "android.arch.work:work-firebase:$work_version"
93+
implementation ("android.arch.work:work-firebase:$work_version") {
94+
exclude group: 'com.google.guava', module: 'listenablefuture'
95+
}
8096
}
8197
apply plugin: 'com.google.gms.google-services'
8298
repositories {

0 commit comments

Comments
 (0)