Skip to content

Commit

Permalink
ci: 移除无效的 protobuf 依赖并更新依赖
Browse files Browse the repository at this point in the history
  • Loading branch information
xz-dev committed Jul 17, 2021
1 parent 56631a3 commit 1f88ab1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
17 changes: 8 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId "net.xzos.upgradeall"
minSdkVersion 21
targetSdkVersion 30
versionCode 80
versionName "0.9.10-rc.3"
versionCode 81
versionName "0.9.10-rc.4"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
kapt {
arguments {
Expand Down Expand Up @@ -67,11 +67,10 @@ dependencies {
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'

implementation "com.google.protobuf:protobuf-javalite:$protoc_version"
// Kotlin
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.core:core-ktx:1.6.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-native-mt'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1-native-mt'

// WorkManager
def work_version = '2.7.0-alpha04'
Expand All @@ -81,7 +80,7 @@ dependencies {
implementation 'com.akexorcist:localization:1.2.10'

// Firebase
implementation 'com.google.firebase:firebase-perf:20.0.1'
implementation 'com.google.firebase:firebase-perf:20.0.2'
implementation 'com.google.firebase:firebase-analytics:19.0.0'
implementation 'com.google.firebase:firebase-crashlytics:18.1.0'
configurations.compile.exclude group: 'com.google.protobuf', module: 'protobuf-lite'
Expand All @@ -96,7 +95,7 @@ dependencies {

// 界面设计
// Google MD 库
implementation 'com.google.android.material:material:1.3.0'
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.github.kobakei:MaterialFabSpeedDial:master-SNAPSHOT'
// svg 单个 path 颜色切换
Expand All @@ -111,8 +110,8 @@ dependencies {
implementation 'com.github.CymChad:BaseRecyclerViewAdapterHelper:3.0.6'

testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test:runner:1.4.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

implementation project(path: ':core')
}
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.5.20'
ext.kotlin_version = '1.5.21'
ext.kotlin_stdlib_version = '1.5.0'
ext.protobuf_version = '0.8.12'
ext.protoc_version = '3.15.6'
repositories {
google()
mavenCentral()
Expand Down
8 changes: 4 additions & 4 deletions core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ android {

dependencies {
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

// Kotlin
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.core:core-ktx:1.6.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"

// Shizuku
Expand All @@ -98,7 +98,7 @@ dependencies {
implementation "androidx.documentfile:documentfile:1.0.1"

// kotlin 协程
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0-native-mt'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.1-native-mt'

// database
def room_version = '2.3.0'
Expand Down

0 comments on commit 1f88ab1

Please sign in to comment.