Skip to content

Commit ecf38c5

Browse files
authored
Merge pull request #1900 from fossasia/development
chore: Release v0.4.0
2 parents b1ff914 + 62f4057 commit ecf38c5

File tree

127 files changed

+6531
-1392
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+6531
-1392
lines changed

app/build.gradle

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,11 @@ android {
2020
applicationId "com.eventyay.attendee"
2121
minSdkVersion 21
2222
targetSdkVersion 28
23-
versionCode 9
24-
versionName "0.3.0"
23+
versionCode 10
24+
versionName "0.4.0"
2525
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2626
vectorDrawables.useSupportLibrary = true
2727
multiDexEnabled true
28-
manifestPlaceholders = [
29-
STRIPE_API_TOKEN: STRIPE_API_TOKEN
30-
]
3128
javaCompileOptions {
3229
annotationProcessorOptions {
3330
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
@@ -40,11 +37,17 @@ android {
4037
minifyEnabled true
4138
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
4239
buildConfigField "String", "DEFAULT_BASE_URL", '"https://api.eventyay.com/v1/"'
40+
buildConfigField "String", "FRONTEND_URL", '"https://eventyay.com/"'
4341
buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
42+
buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
43+
resValue "string", "FRONTEND_HOST", "eventyay.com"
4444
}
4545
debug {
4646
buildConfigField "String", "DEFAULT_BASE_URL", '"https://open-event-api-dev.herokuapp.com/v1/"'
47+
buildConfigField "String", "FRONTEND_URL", '"https://fossasia.github.io/open-event-frontend/"'
4748
buildConfigField "String", "MAPBOX_KEY", '"'+MAPBOX_KEY+'"'
49+
buildConfigField "String", "STRIPE_API_KEY", '"'+STRIPE_API_TOKEN+'"'
50+
resValue "string", "FRONTEND_HOST", "fossasia.github.io/open-event-frontend"
4851
}
4952
}
5053

@@ -96,8 +99,8 @@ repositories {
9699

97100
dependencies {
98101
def lifecycle_version = "2.2.0-alpha01"
99-
def koin_version = "2.0.0-GA6"
100-
def roomVersion = "2.1.0-beta01"
102+
def koin_version = "2.0.1"
103+
def roomVersion = "2.1.0-rc01"
101104
def ktx_version = "1.0.0"
102105
def ktx2_version = "2.0.0"
103106
def nav_version = "2.1.0-alpha04"
@@ -109,7 +112,7 @@ dependencies {
109112
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta1'
110113
implementation 'androidx.cardview:cardview:1.0.0'
111114
implementation 'androidx.recyclerview:recyclerview:1.1.0-alpha05'
112-
implementation 'com.google.android.material:material:1.1.0-alpha06'
115+
implementation 'com.google.android.material:material:1.1.0-alpha07'
113116
implementation "androidx.browser:browser:1.0.0"
114117
implementation 'androidx.exifinterface:exifinterface:1.0.0'
115118
implementation "androidx.lifecycle:lifecycle-extensions:${lifecycle_version}"
@@ -141,12 +144,12 @@ dependencies {
141144

142145
// Timber
143146
implementation 'com.jakewharton.timber:timber:4.7.1'
144-
implementation 'com.jakewharton.threetenabp:threetenabp:1.2.0'
147+
implementation 'com.jakewharton.threetenabp:threetenabp:1.2.1'
145148

146-
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9"
149+
implementation "com.fasterxml.jackson.module:jackson-module-kotlin:2.9.6"
147150
implementation 'com.github.jasminb:jsonapi-converter:0.9'
148-
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.1'
149-
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
151+
implementation 'com.squareup.okhttp3:logging-interceptor:3.14.2'
152+
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
150153
implementation 'com.squareup.retrofit2:converter-jackson:2.5.0'
151154

152155
// Cards Shimmer Animation
@@ -155,14 +158,14 @@ dependencies {
155158
// RxJava
156159
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
157160
implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0'
158-
implementation 'io.reactivex.rxjava2:rxjava:2.2.8'
161+
implementation 'io.reactivex.rxjava2:rxjava:2.2.9'
159162
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.4.0'
160163

161164
// Picasso
162165
implementation 'com.squareup.picasso:picasso:2.71828'
163166

164167
// Stripe
165-
implementation 'com.stripe:stripe-android:9.0.1'
168+
implementation 'com.stripe:stripe-android:9.1.1'
166169

167170
// QR Code
168171
implementation 'com.journeyapps:zxing-android-embedded:3.6.0'
@@ -185,13 +188,13 @@ dependencies {
185188
testImplementation 'com.github.iamareebjamal:stetho-noop:1.2.1'
186189

187190
//LeakCanary
188-
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-1'
191+
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-alpha-2'
189192

190193
testImplementation 'junit:junit:4.12'
191194
testImplementation "io.mockk:mockk:1.9.3"
192195
testImplementation 'org.threeten:threetenbp:1.4.0'
193196
testImplementation "org.koin:koin-test:$koin_version"
194197
testImplementation 'androidx.arch.core:core-testing:2.0.1'
195-
androidTestImplementation 'androidx.test:runner:1.1.1'
196-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
198+
androidTestImplementation 'androidx.test:runner:1.2.0'
199+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
197200
}

0 commit comments

Comments
 (0)