Skip to content

Commit ee5d594

Browse files
yongceyongce
committed
Gradle AGP and libraries
1 parent e9ee7f0 commit ee5d594

Some content is hidden

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

53 files changed

+109
-97
lines changed

‎.idea/compiler.xml

Lines changed: 1 addition & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 22 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android_project_common.gradle

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,22 @@ ext {
3838
'compileSdk' : 30,
3939

4040
// Android official support
41-
'kotlin' : '1.4.10',
42-
'kotlinCoroutine' : "1.3.9",
41+
'kotlin' : '1.4.31',
42+
'kotlinCoroutine' : "1.4.1",
4343
'multidexLib' : "2.0.1",
4444
'androidxCore' : '1.3.2',
45-
'fragment' : '1.2.5',
45+
'fragment' : '1.3.0',
4646
'preference' : "1.1.1",
4747
'palette' : "1.0.0",
4848
'recyclerView' : "1.1.0",
49-
'constraintLayout' : "2.0.2",
49+
'constraintLayout' : "2.0.4",
5050
'vectorDrawable' : "1.1.0",
51-
'lintLib' : '27.0.0',
51+
'lintLib' : '27.1.3',
5252
'archCore' : "2.1.0",
53-
'lifecycle' : "2.2.0",
53+
'lifecycle' : "2.3.0",
5454
'room' : '2.2.5',
5555
'sqlite' : "2.1.0",
56-
'navigation' : "2.3.0",
56+
'navigation' : "2.3.3",
5757
'paging' : "2.1.2",
5858
'work' : "2.4.0",
5959
'media2' : "1.0.3",
@@ -66,7 +66,7 @@ ext {
6666
'hamcrest' : '2.2',
6767
'mockito' : "3.5.11",
6868
'powermock' : '1.6.6',
69-
'robolectric' : '4.3.1',
69+
'robolectric' : '4.5.1',
7070
'mockk' : "1.10.0",
7171

7272
// google
@@ -79,16 +79,16 @@ ext {
7979
'guava' : "29.0-android",
8080

8181
// debug
82-
'leakcanary' : "2.4",
82+
'leakcanary' : "2.5",
8383
'stetho' : '1.5.1',
84-
'ktlint' : "0.36.0",
84+
'ktlint' : "0.41.0",
8585

8686
// serializing
8787
'gson' : '2.8.6',
8888
'protobuf' : "3.1.0",
8989

9090
// network & image
91-
'okhttp' : '4.8.1',
91+
'okhttp' : '4.9.0',
9292
'retrofit' : '2.9.0',
9393
'glide' : '4.11.0',
9494
'glideTrans' : "4.0.0",
@@ -123,7 +123,7 @@ ext {
123123
'collectionKtx' : "androidx.collection:collection-ktx:1.1.0",
124124
// UI
125125
'appcompat' : "androidx.appcompat:appcompat:1.2.0",
126-
'material' : "com.google.android.material:material:1.2.1",
126+
'material' : "com.google.android.material:material:1.3.0",
127127
'preference' : "androidx.preference:preference:${versions.preference}",
128128
'preferenceKtx' : "androidx.preference:preference-ktx:${versions.preference}",
129129
'constraintLayout' : "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}",
@@ -148,7 +148,7 @@ ext {
148148
'mediaSession' : "androidx.media2:media2-session:${versions.media2}",
149149
'mediaExoPlayer' : "androidx.media2:media2-exoplayer:${versions.media2}",
150150
'mediarouter' : "androidx.mediarouter:mediarouter:1.1.0",
151-
'exifinterface' : "androidx.exifinterface:exifinterface:1.3.0",
151+
'exifinterface' : "androidx.exifinterface:exifinterface:1.3.1",
152152
'wear' : "androidx.wear:wear:1.0.0",
153153
// legacy
154154
'coreUtils' : "androidx.legacy:legacy-support-core-utils:1.0.0",

‎archLib/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43
apply from: "${androidModuleCommon}"
54
apply from: '../build_common.gradle'
65

‎archLintRules/src/main/java/me/ycdev/android/arch/lint/MyBaseActivityDetector.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import com.android.tools.lint.detector.api.Issue
66
import com.android.tools.lint.detector.api.JavaContext
77
import com.android.tools.lint.detector.api.Scope
88
import com.android.tools.lint.detector.api.Severity
9-
import java.util.HashSet
109
import me.ycdev.android.arch.lint.base.InheritDetectorBase
1110
import org.jetbrains.uast.UElement
11+
import java.util.HashSet
1212

1313
class MyBaseActivityDetector : InheritDetectorBase() {
1414
override val applicableClasses: List<String> = arrayListOf("android.app.Activity")

‎archLintRules/src/main/java/me/ycdev/android/arch/lint/base/InheritDetectorBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package me.ycdev.android.arch.lint.base
22

33
import com.android.tools.lint.detector.api.Detector
44
import com.android.tools.lint.detector.api.JavaContext
5-
import java.util.HashSet
65
import org.jetbrains.uast.UClass
76
import org.jetbrains.uast.UElement
7+
import java.util.HashSet
88

99
abstract class InheritDetectorBase : Detector(), Detector.UastScanner {
1010
protected abstract val applicableClasses: List<String>

‎archLintRulesTestDemo/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,37 +42,37 @@ dependencies {
4242
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:${versions.kotlinCoroutine}"
4343

4444
// The following dependencies are just for checking new versions of library
45-
implementation "androidx.core:core:${versions.androidxCore}"
45+
implementation "androidx.core:core-ktx:${versions.androidxCore}"
4646
implementation "androidx.fragment:fragment:${versions.fragment}"
47-
implementation "com.google.android.material:material:1.2.1"
47+
implementation "com.google.android.material:material:1.3.0"
4848
implementation "androidx.multidex:multidex:${versions.multidexLib}"
4949
implementation "androidx.annotation:annotation:1.1.0"
5050
implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
51-
implementation "androidx.collection:collection:1.1.0"
52-
implementation "androidx.preference:preference:${versions.preference}"
51+
implementation "androidx.collection:collection-ktx:1.1.0"
52+
implementation "androidx.preference:preference-ktx:${versions.preference}"
5353
implementation "androidx.constraintlayout:constraintlayout:${versions.constraintLayout}"
5454
implementation "androidx.cardview:cardview:1.0.0"
5555
implementation "androidx.gridlayout:gridlayout:1.0.0"
56-
implementation "androidx.palette:palette:${versions.palette}"
56+
implementation "androidx.palette:palette-ktx:${versions.palette}"
5757
implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
5858
implementation "androidx.coordinatorlayout:coordinatorlayout:1.1.0"
5959
implementation "androidx.drawerlayout:drawerlayout:1.1.1"
6060
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
6161
implementation "androidx.viewpager2:viewpager2:1.0.0"
62-
implementation "androidx.navigation:navigation-runtime:${versions.navigation}"
63-
implementation "androidx.paging:paging-runtime:${versions.paging}"
62+
implementation "androidx.navigation:navigation-runtime-ktx:${versions.navigation}"
63+
implementation "androidx.paging:paging-runtime-ktx:${versions.paging}"
6464
implementation "androidx.work:work-runtime:${versions.work}"
6565
implementation "androidx.vectordrawable:vectordrawable:${versions.vectorDrawable}"
6666
implementation "androidx.browser:browser:1.2.0"
6767
implementation "androidx.transition:transition:1.3.1"
6868
implementation "androidx.media2:media2-session:${versions.media2}"
6969
implementation "androidx.mediarouter:mediarouter:1.1.0"
70-
implementation "androidx.exifinterface:exifinterface:1.3.0"
70+
implementation "androidx.exifinterface:exifinterface:1.3.1"
7171

7272
implementation "androidx.arch.core:core-common:${versions.archCore}"
7373
implementation "androidx.lifecycle:lifecycle-runtime:${versions.lifecycle}"
7474
implementation "androidx.room:room-runtime:${versions.room}"
75-
implementation "androidx.sqlite:sqlite:${versions.sqlite}"
75+
implementation "androidx.sqlite:sqlite-ktx:${versions.sqlite}"
7676

7777
implementation ("com.google.android.gms:play-services-auth:${versions.gms}", {
7878
exclude group: 'com.android.support'

‎baseLib/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43
apply from: "${androidModuleCommon}"
54
apply from: '../build_common.gradle'
65

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/async/AsyncTaskQueueTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import androidx.test.filters.LargeTest
77
import androidx.test.filters.MediumTest
88
import androidx.test.filters.SmallTest
99
import com.google.common.truth.Truth.assertThat
10-
import java.util.concurrent.CountDownLatch
11-
import java.util.concurrent.TimeUnit
1210
import me.ycdev.android.lib.common.utils.MainHandler
1311
import me.ycdev.android.lib.common.utils.ThreadUtils
1412
import org.junit.Test
1513
import org.junit.runner.RunWith
1614
import timber.log.Timber
15+
import java.util.concurrent.CountDownLatch
16+
import java.util.concurrent.TimeUnit
1717

1818
@RunWith(AndroidJUnit4::class)
1919
@LargeTest

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/async/HandlerTaskExecutorTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import android.os.Looper
44
import android.os.SystemClock
55
import androidx.test.filters.LargeTest
66
import com.google.common.truth.Truth.assertThat
7+
import org.junit.Test
78
import java.util.ArrayList
89
import java.util.concurrent.CountDownLatch
910
import java.util.concurrent.TimeUnit
10-
import org.junit.Test
1111

1212
@LargeTest
1313
class HandlerTaskExecutorTest {

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/async/TaskSchedulerTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import androidx.test.filters.LargeTest
77
import androidx.test.filters.MediumTest
88
import com.google.common.truth.Truth.assertThat
99
import org.junit.After
10-
import java.util.concurrent.CountDownLatch
11-
import java.util.concurrent.TimeUnit
1210
import org.junit.Assert.fail
1311
import org.junit.Before
1412
import org.junit.Test
13+
import java.util.concurrent.CountDownLatch
14+
import java.util.concurrent.TimeUnit
1515

1616
@LargeTest
1717
class TaskSchedulerTest {

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/demo/service/operation/HelloOperation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package me.ycdev.android.lib.common.demo.service.operation
22

33
import android.os.RemoteException
44
import androidx.annotation.NonNull
5-
import java.util.concurrent.CountDownLatch
65
import me.ycdev.android.lib.common.demo.service.IDemoService
76
import me.ycdev.android.lib.common.ipc.IpcOperation
7+
import java.util.concurrent.CountDownLatch
88

99
class HelloOperation(private val mGift: String) : IpcOperation<IDemoService> {
1010
private var mLatch: CountDownLatch? = null

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/demo/service/operation/WhoOperation.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package me.ycdev.android.lib.common.demo.service.operation
22

33
import android.os.RemoteException
44
import androidx.annotation.NonNull
5-
import java.util.concurrent.CountDownLatch
65
import me.ycdev.android.lib.common.demo.service.IDemoService
76
import me.ycdev.android.lib.common.ipc.IpcOperation
7+
import java.util.concurrent.CountDownLatch
88

99
class WhoOperation : IpcOperation<IDemoService> {
1010
private var mLatch: CountDownLatch? = null

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/ipc/ServiceClientBaseTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
88
import androidx.test.filters.LargeTest
99
import androidx.test.filters.SmallTest
1010
import com.google.common.truth.Truth.assertThat
11-
import java.util.concurrent.CountDownLatch
12-
import java.util.concurrent.TimeUnit
1311
import me.ycdev.android.lib.common.demo.service.IDemoService
1412
import me.ycdev.android.lib.common.demo.service.LocalServiceClient
1513
import me.ycdev.android.lib.common.demo.service.RemoteServiceClient
1614
import me.ycdev.android.lib.common.demo.service.operation.HelloOperation
1715
import me.ycdev.android.lib.common.utils.ThreadManager
1816
import org.junit.Test
1917
import org.junit.runner.RunWith
18+
import java.util.concurrent.CountDownLatch
19+
import java.util.concurrent.TimeUnit
2020

2121
@RunWith(AndroidJUnit4::class)
2222
@LargeTest

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/ipc/ServiceConnectorTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import androidx.test.filters.LargeTest
1212
import androidx.test.filters.MediumTest
1313
import androidx.test.filters.SmallTest
1414
import com.google.common.truth.Truth.assertThat
15-
import java.lang.ref.WeakReference
16-
import java.util.concurrent.CountDownLatch
1715
import me.ycdev.android.lib.common.demo.service.IDemoService
1816
import me.ycdev.android.lib.common.demo.service.LocalServiceConnector
1917
import me.ycdev.android.lib.common.demo.service.RemoteService
@@ -23,6 +21,8 @@ import me.ycdev.android.lib.common.utils.GcHelper
2321
import org.junit.Assert.fail
2422
import org.junit.Test
2523
import org.junit.runner.RunWith
24+
import java.lang.ref.WeakReference
25+
import java.util.concurrent.CountDownLatch
2626

2727
@RunWith(AndroidJUnit4::class)
2828
@LargeTest

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/provider/InfoProviderClientTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import android.os.Looper
77
import androidx.test.core.app.ApplicationProvider
88
import androidx.test.ext.junit.runners.AndroidJUnit4
99
import com.google.common.truth.Truth.assertThat
10-
import java.util.concurrent.CountDownLatch
11-
import java.util.concurrent.TimeUnit
1210
import org.junit.Before
1311
import org.junit.Test
1412
import org.junit.runner.RunWith
13+
import java.util.concurrent.CountDownLatch
14+
import java.util.concurrent.TimeUnit
1515

1616
@RunWith(AndroidJUnit4::class)
1717
class InfoProviderClientTest {

‎baseLib/src/androidTest/java/me/ycdev/android/lib/common/utils/GcHelperTest2.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package me.ycdev.android.lib.common.utils
22

33
import com.google.common.truth.Truth.assertThat
4-
import java.lang.ref.ReferenceQueue
5-
import java.lang.ref.WeakReference
64
import me.ycdev.android.lib.common.type.BooleanHolder
75
import org.junit.Test
86
import timber.log.Timber
7+
import java.lang.ref.ReferenceQueue
8+
import java.lang.ref.WeakReference
99

1010
class GcHelperTest2 {
1111

‎baseLib/src/main/java/me/ycdev/android/lib/common/activity/ActivityTaskTracker.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import android.app.Application
55
import android.os.Bundle
66
import androidx.annotation.GuardedBy
77
import androidx.annotation.VisibleForTesting
8-
import java.util.concurrent.atomic.AtomicInteger
98
import timber.log.Timber
9+
import java.util.concurrent.atomic.AtomicInteger
1010

1111
/**
1212
* This class can be used to track Activity/task state changes.

‎baseLib/src/main/java/me/ycdev/android/lib/common/annotation/HandlerWork.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ package me.ycdev.android.lib.common.annotation
99
AnnotationTarget.PROPERTY_SETTER
1010
)
1111
@Retention(AnnotationRetention.SOURCE)
12-
annotation class HandlerWork(val value: String)
12+
annotation class HandlerWork(val value: String)

‎baseLib/src/main/java/me/ycdev/android/lib/common/apps/AppInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package me.ycdev.android.lib.common.apps
22

33
import android.graphics.drawable.Drawable
4+
import me.ycdev.android.lib.common.utils.DateTimeUtils
45
import java.text.Collator
56
import java.util.Comparator
6-
import me.ycdev.android.lib.common.utils.DateTimeUtils
77

88
data class AppInfo(val pkgName: String) {
99
var appUid: Int = 0

0 commit comments

Comments
 (0)