Skip to content

Commit

Permalink
升级IDE版本,并更新库文件版本...
Browse files Browse the repository at this point in the history
  • Loading branch information
Antecer committed Apr 28, 2019
1 parent e38b73b commit 6776cb0
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 20 deletions.
22 changes: 12 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ android {

defaultConfig {
applicationId "com.gedoor.monkeybook"
minSdkVersion 19
minSdkVersion 21
targetSdkVersion 28
versionCode 10000 + gitCommits
versionName version
Expand All @@ -42,14 +42,16 @@ android {
buildConfigField "boolean", "IS_RELEASE", "true"
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
multiDexEnabled = true
}
debug {
signingConfig signingConfigs.myConfig
applicationIdSuffix '.debug'
versionNameSuffix ' debug'
versionNameSuffix 'debug'
buildConfigField "boolean", "IS_RELEASE", "false"
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
multiDexEnabled = true
}
android.applicationVariants.all { variant ->
variant.outputs.all {
Expand All @@ -75,14 +77,14 @@ dependencies {

//androidX
implementation 'androidx.multidex:multidex:2.0.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha4'
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha5'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.media:media:1.1.0-alpha04'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'

//google
implementation 'com.google.android.material:material:1.1.0-alpha05'
implementation 'com.google.code.gson:gson:2.8.2'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.android:flexbox:1.1.0'

//J_SOUP
Expand All @@ -96,18 +98,18 @@ dependencies {
implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0'

//codecMD5
implementation 'commons-codec:commons-codec:1.11'
implementation 'commons-codec:commons-codec:20041127.091804'

//Glide
implementation 'com.github.bumptech.glide:glide:4.8.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0'
implementation 'com.github.bumptech.glide:glide:4.9.0'
annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'

//CircleImageView
implementation 'de.hdodenhof:circleimageview:3.0.0'

//bind view
implementation 'com.jakewharton:butterknife:10.0.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
implementation 'com.jakewharton:butterknife:10.1.0'
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'

//webServer
implementation 'org.nanohttpd:nanohttpd:2.3.1'
Expand All @@ -132,7 +134,7 @@ dependencies {
implementation 'net.ricecode:string-similarity:1.0.0'

//MarkDown
implementation 'ru.noties.markwon:core:3.0.0'
implementation 'ru.noties.markwon:core:3.0.1'

//epub
implementation('nl.siegmann.epublib:epublib-core:3.1') {
Expand Down
10 changes: 6 additions & 4 deletions basemvplib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ android {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
android {
}
}

compileOptions {
Expand All @@ -25,18 +27,18 @@ android {

dependencies {
api fileTree(dir: 'libs', include: ['*.jar'])
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13-beta-2'

//support
api 'androidx.core:core:1.1.0-alpha05'
api 'androidx.appcompat:appcompat:1.1.0-alpha04'

//RxAndroid
api 'io.reactivex.rxjava2:rxjava:2.2.6'
api 'io.reactivex.rxjava2:rxandroid:2.1.0'
api 'io.reactivex.rxjava2:rxjava:2.2.8'
api 'io.reactivex.rxjava2:rxandroid:2.1.1'

//RxBus
api 'com.hwangjr.rxbus:rxbus:2.0.0'
api 'com.hwangjr.rxbus:rxbus:2.0.1'

//Retrofit
api 'com.squareup.retrofit2:retrofit:2.5.0'
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ buildscript {
maven { url 'https://maven.fabric.io/public' }
}
dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
classpath 'com.google.gms:google-services:4.2.0'
classpath 'io.fabric.tools:gradle:1.25.4'
classpath 'io.fabric.tools:gradle:1.28.1'
classpath 'net.ricecode:string-similarity:1.0.0'
}
}
Expand Down
7 changes: 5 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,15 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx1024m -XX:MaxPermSize=256m
# org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xms1024m -Xmx4096m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
#
# When configured, Gradle will run in incubating parallel mode.
# 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
#Fri Mar 30 10:51:47 CST 2018
android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true
org.gradle.parallel=true
org.gradle.damon=true
org.gradle.configureondemand=true
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Jan 16 09:59:46 CST 2019
#Sun Apr 28 22:21:17 CST 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

0 comments on commit 6776cb0

Please sign in to comment.