Skip to content
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

Release 2020-05-10 12:38:49 +0900 #71

Merged
merged 22 commits into from
May 10, 2020
Merged

Release 2020-05-10 12:38:49 +0900 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
354a2c0
Update Gradle
cutmail Oct 2, 2019
f70c565
Merge pull request #63 from cutmail/update-gradle
cutmail Oct 3, 2019
3751899
Update appcompat to v1.1.0
cutmail Oct 3, 2019
db38623
Update fabric gradle tools
cutmail Oct 3, 2019
90510d3
Merge pull request #64 from cutmail/update-appcompat
cutmail Oct 3, 2019
a59ad62
Update firebase-database
cutmail Oct 3, 2019
b1e6f36
Merge pull request #65 from cutmail/update-fabric-gradle-tools2
cutmail Oct 3, 2019
0010e76
Update ButterKnife
cutmail Oct 3, 2019
75575d9
Merge pull request #66 from cutmail/update-firebase-database
cutmail Oct 3, 2019
f53f385
Merge pull request #67 from cutmail/update-butterknife
cutmail Oct 3, 2019
f25012e
Update oss-licenses
cutmail Oct 3, 2019
740b5ab
Rename CI dir
cutmail Oct 3, 2019
f6cc721
Merge pull request #68 from cutmail/update-gms-license
cutmail Oct 3, 2019
2790c81
Merge pull request #69 from cutmail/rename-circleci-dir
cutmail Oct 3, 2019
42401de
Update Gradle
cutmail May 10, 2020
2ddcc46
Bump up 1.9.2 (21)
cutmail May 10, 2020
da3c572
Update ButterKnife to 10.2.1
cutmail May 10, 2020
9244425
Merge pull request #70 from cutmail/update-gradle
cutmail May 10, 2020
bb47543
Update libraries
cutmail May 10, 2020
8edee76
Merge pull request #72 from cutmail/update-butterknife
cutmail May 10, 2020
e2c4176
Merge branch 'develop' into update-libraries
cutmail May 10, 2020
faa2096
Merge pull request #73 from cutmail/update-libraries
cutmail May 10, 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
0 .circle/google-services.json → .ci/google-services.json
View file
Open in desktop
File renamed without changes.
0 .circle/setup-fabric-properties.sh → .ci/setup-fabric-properties.sh
View file
Open in desktop
File renamed without changes.
18 changes: 9 additions & 9 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'io.fabric.tools:gradle:1.27.1'
classpath 'io.fabric.tools:gradle:1.31.1'
}
}
apply plugin: 'com.android.application'
Expand All @@ -29,8 +29,8 @@ android {
applicationId "me.cutmail.disasterapp"
minSdkVersion 26
targetSdkVersion 29
versionCode 20
versionName "1.9.1"
versionCode 21
versionName "1.9.2"
}
buildTypes {
release {
Expand All @@ -43,15 +43,15 @@ dependencies {
implementation('com.crashlytics.sdk.android:crashlytics:2.10.1@aar') {
transitive = true
}
implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
implementation 'androidx.paging:paging-runtime:2.1.0'
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.paging:paging-runtime:2.1.2'
implementation 'com.jakewharton.timber:timber:4.7.1'
implementation 'com.github.hotchemi:android-rate:1.0.1'
implementation 'com.firebaseui:firebase-ui-firestore:4.3.2'
implementation 'com.google.firebase:firebase-database:19.0.0'
implementation 'com.google.firebase:firebase-core:17.2.0'
implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
implementation 'com.google.firebase:firebase-database:19.3.0'
implementation 'com.google.firebase:firebase-core:17.4.1'
implementation 'com.jakewharton:butterknife:10.2.1'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'
implementation 'com.google.android.gms:play-services-oss-licenses:17.0.0'
}

Expand Down
6 changes: 3 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:3.6.3'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.google.gms:google-services:4.2.0'
classpath 'com.google.android.gms:oss-licenses-plugin:0.9.4'
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.android.gms:oss-licenses-plugin:0.10.2'
}
}

Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Feb 19 14:47:56 JST 2019
#Sun May 10 12:07:32 JST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip