Skip to content

Commit

Permalink
更新sdk版本和库
Browse files Browse the repository at this point in the history
  • Loading branch information
gedoor committed Apr 1, 2022
1 parent 8ab75f5 commit 0bebe02
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 29 deletions.
44 changes: 22 additions & 22 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def version = "2." + releaseTime()
def gitCommits = Integer.parseInt('git rev-list --count HEAD'.execute([], project.rootDir).text.trim())

android {
compileSdkVersion 30
compileSdkVersion 31
signingConfigs {
myConfig {
storeFile file(RELEASE_STORE_FILE)
Expand All @@ -27,7 +27,7 @@ android {
defaultConfig {
applicationId "com.gedoor.monkeybook"
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode 10000 + gitCommits
versionName version
project.ext.set("archivesBaseName", name + "_" + version)
Expand Down Expand Up @@ -67,8 +67,8 @@ android {
// Flag to enable support for the new language APIs
coreLibraryDesugaringEnabled true
// Sets Java compatibility to Java 8
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
}
tasks.withType(JavaCompile) {
options.compilerArgs << "-Xlint:unchecked"
Expand All @@ -90,7 +90,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"

//协程
def coroutines_version = '1.5.1'
def coroutines_version = '1.6.0'
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version")

Expand All @@ -100,21 +100,21 @@ dependencies {
implementation "org.jetbrains.anko:anko-sdk27-listeners:$anko_version"

//lifecycle
def lifecycle_version = '2.3.1'
def lifecycle_version = '2.4.1'
implementation("androidx.lifecycle:lifecycle-common-java8:$lifecycle_version")

//androidX
implementation('androidx.appcompat:appcompat:1.3.1')
implementation('androidx.core:core-ktx:1.6.0')
implementation("androidx.activity:activity-ktx:1.3.1")
implementation("androidx.fragment:fragment-ktx:1.3.6")
implementation('androidx.preference:preference-ktx:1.1.1')
implementation('androidx.constraintlayout:constraintlayout:2.1.0')
implementation('androidx.appcompat:appcompat:1.4.1')
implementation('androidx.core:core-ktx:1.7.0')
implementation("androidx.activity:activity-ktx:1.4.0")
implementation("androidx.fragment:fragment-ktx:1.4.1")
implementation('androidx.preference:preference-ktx:1.2.0')
implementation('androidx.constraintlayout:constraintlayout:2.1.3')
implementation('androidx.swiperefreshlayout:swiperefreshlayout:1.1.0')
implementation('androidx.viewpager2:viewpager2:1.0.0')
implementation('com.google.android.material:material:1.4.0')
implementation('com.google.android.material:material:1.5.0')
implementation('com.google.android.flexbox:flexbox:3.0.0')
implementation('com.google.code.gson:gson:2.8.8')
implementation('com.google.code.gson:gson:2.9.0')
implementation('androidx.webkit:webkit:1.4.0')

//Splitties
Expand All @@ -124,8 +124,8 @@ dependencies {
implementation("com.louiscad.splitties:splitties-views:$splitties_version")

//media
implementation("androidx.media:media:1.4.1")
def exoplayer_version = '2.15.0'
implementation("androidx.media:media:1.5.0")
def exoplayer_version = '2.17.1'
implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
implementation "com.google.android.exoplayer:extension-okhttp:$exoplayer_version"
implementation "com.google.android.exoplayer:exoplayer-hls:$exoplayer_version"
Expand All @@ -134,8 +134,8 @@ dependencies {
implementation "com.google.android.exoplayer:exoplayer-rtsp:$exoplayer_version"

//google
implementation 'com.google.android.material:material:1.4.0'
implementation 'com.google.code.gson:gson:2.8.8'
implementation 'com.google.android.material:material:1.5.0'
implementation 'com.google.code.gson:gson:2.9.0'

//RxAndroid
implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
Expand All @@ -152,8 +152,8 @@ dependencies {

//J_SOUP
implementation 'org.jsoup:jsoup:1.14.3'
implementation 'cn.wanghaomiao:JsoupXpath:2.5.0'
implementation 'com.jayway.jsonpath:json-path:2.6.0'
implementation 'cn.wanghaomiao:JsoupXpath:2.5.1'
implementation 'com.jayway.jsonpath:json-path:2.7.0'

//JS
//noinspection GradleDependency
Expand All @@ -164,8 +164,8 @@ dependencies {
implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.2.1'

//Glide
implementation 'com.github.bumptech.glide:glide:4.12.0'
kapt 'com.github.bumptech.glide:compiler:4.12.0'
implementation 'com.github.bumptech.glide:glide:4.13.1'
kapt 'com.github.bumptech.glide:compiler:4.13.1'

//CircleImageView
implementation 'de.hdodenhof:circleimageview:3.1.0'
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/com/kunfei/bookshelf/DbHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
import com.kunfei.bookshelf.dao.ReplaceRuleBeanDao;
import com.kunfei.bookshelf.dao.SearchHistoryBeanDao;
import com.kunfei.bookshelf.dao.TxtChapterRuleBeanDao;
import com.kunfei.bookshelf.help.DefaultValueHelper;

import org.greenrobot.greendao.database.Database;

Expand All @@ -34,7 +33,6 @@ private DbHelper() {
// 注意:该数据库连接属于 DaoMaster,所以多个 Session 指的是相同的数据库连接。
DaoMaster mDaoMaster = new DaoMaster(db);
mDaoSession = mDaoMaster.newSession();
mDaoSession.getBookSourceBeanDao().insertOrReplace(DefaultValueHelper.INSTANCE.getXxlSource());
}

public static DbHelper getInstance() {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ext {
support_library_version = '28.0.0'
}
buildscript {
ext.kotlin_version = '1.5.31'
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
Expand All @@ -11,10 +11,10 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' }
}
dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.5.2'
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
classpath 'net.ricecode:string-similarity:1.0.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'de.timfreiheit.resourceplaceholders:placeholders:0.4'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Sat Jun 05 22:59:28 CST 2021
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

0 comments on commit 0bebe02

Please sign in to comment.