Skip to content

Commit 692511a

Browse files
author
fengpeng
committed
构建版本升级至28
1 parent 1b3072b commit 692511a

6 files changed

Lines changed: 17 additions & 19 deletions

File tree

app/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 27
8+
compileSdkVersion 28
99
defaultConfig {
1010
applicationId "pizzk.media.picker.demo"
1111
minSdkVersion 21
12-
targetSdkVersion 27
12+
targetSdkVersion 28
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -25,8 +25,8 @@ android {
2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
2727
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
28-
implementation 'com.android.support:appcompat-v7:27.1.1'
29-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
28+
implementation 'com.android.support:appcompat-v7:28.0.0'
29+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
3030
testImplementation 'junit:junit:4.12'
3131
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3232
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'

app/src/main/java/pizzk/media/picker/demo/MainActivity.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ class MainActivity : AppCompatActivity() {
2525
val size: Int = resources.getDimensionPixelSize(R.dimen.x75)
2626
val tvHint: TextView = findViewById(R.id.tvHint)
2727
val lp: ViewGroup.LayoutParams = ViewGroup.LayoutParams(size, size)
28-
val special: PhotoGroupView.Special = PhotoGroupView.Special(
29-
this@MainActivity, lp = lp, limit = 4, column = 4
30-
)
28+
val special: PhotoGroupView.Special = PhotoGroupView.Special(this@MainActivity, lp = lp, limit = 4, column = 4)
3129
photoGroup.setup(special, emptyList(), false) {
3230
tvHint.text = "(${it.selectCount()}/${special.limit})"
3331
}

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.41'
4+
ext.kotlin_version = '1.2.71'
55
repositories {
66
google()
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.1.4'
10+
classpath 'com.android.tools.build:gradle:3.2.1'
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1212

1313
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jul 10 15:00:57 CST 2018
1+
#Sun Oct 28 13:51:41 CST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

picker/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33

44
android {
5-
compileSdkVersion 27
5+
compileSdkVersion 28
66

77
defaultConfig {
88
minSdkVersion 21
9-
targetSdkVersion 27
9+
targetSdkVersion 28
1010
versionCode 1
1111
versionName "1.0"
1212

@@ -25,13 +25,13 @@ android {
2525

2626
dependencies {
2727
implementation fileTree(include: ['*.jar'], dir: 'libs')
28-
implementation 'com.android.support:appcompat-v7:27.1.1'
28+
implementation 'com.android.support:appcompat-v7:28.0.0'
2929
testImplementation 'junit:junit:4.12'
3030
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3131
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3232
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
33-
api 'com.android.support:recyclerview-v7:27.1.1'
34-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
33+
api 'com.android.support:recyclerview-v7:28.0.0'
34+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
3535
api 'com.github.bumptech.glide:glide:4.8.0'
3636
implementation 'com.github.chrisbanes:PhotoView:2.1.3'
3737

picker/src/main/java/pizzk/media/picker/widget/PhotoGroupView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import pizzk.media.picker.view.PickChoseActivity
2121
*/
2222
class PhotoGroupView : RecyclerView {
2323

24-
constructor(context: Context?) : super(context)
25-
constructor(context: Context?, attrs: AttributeSet?) : super(context, attrs)
26-
constructor(context: Context?, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
24+
constructor(context: Context) : super(context)
25+
constructor(context: Context, attrs: AttributeSet?) : super(context, attrs)
26+
constructor(context: Context, attrs: AttributeSet?, defStyle: Int) : super(context, attrs, defStyle)
2727

2828
init {
2929
isVerticalScrollBarEnabled = false

0 commit comments

Comments
 (0)