Skip to content

Commit 651d237

Browse files
committed
更新版本到1.0.4:更新Build版本和官方库版本
1 parent 85d8768 commit 651d237

File tree

7 files changed

+24
-17
lines changed

7 files changed

+24
-17
lines changed

.idea/gradle.xml

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

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ android {
3737

3838
dependencies {
3939
implementation project(path: ':stateLayout')
40-
implementation 'androidx.core:core-ktx:1.10.1'
41-
implementation 'androidx.appcompat:appcompat:1.7.0-alpha02'
42-
implementation 'com.google.android.material:material:1.11.0-alpha01'
43-
implementation 'androidx.constraintlayout:constraintlayout:2.2.0-alpha10'
44-
implementation 'com.airbnb.android:lottie:6.0.0'
40+
implementation 'androidx.core:core-ktx:1.12.0'
41+
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
42+
implementation 'com.google.android.material:material:1.11.0-alpha03'
43+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
44+
implementation 'com.airbnb.android:lottie:6.1.0'
4545
}

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '8.0.2' apply false
4-
id 'com.android.library' version '8.0.2' apply false
3+
id 'com.android.application' version '8.1.2' apply false
4+
id 'com.android.library' version '8.1.2' apply false
55
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
66
}
77

88
ext{
9-
VERSION_NAME = '1.0.3'
9+
VERSION_NAME = '1.0.4'
1010
}

publish.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ afterEvaluate {
3535
publications {
3636
release(MavenPublication) {
3737
//添加这个,否则aar文件不上传
38-
artifact(tasks.getByName("bundleReleaseAar"))
38+
artifact(tasks.named("bundleReleaseAar"))
3939
artifact(androidJavadocsJar)
4040
artifact(androidSourcesJar)
4141
groupId = GROUP_ID // 唯一标识(通常为模块包名,也可以任意)
@@ -91,20 +91,20 @@ afterEvaluate {
9191
}
9292

9393
//生成文档注释
94-
task androidJavadocs(type: Javadoc) {
94+
tasks.register('androidJavadocs', Javadoc) {
9595
//设置源码所在的位置
9696
source = android.sourceSets.main.java.srcDirs
9797
}
9898

9999
//将文档打包成jar,生成javadoc.jar
100-
task androidJavadocsJar(type: Jar) {
100+
tasks.register('androidJavadocsJar', Jar) {
101101
// 指定文档名称
102102
archiveClassifier.set('javadoc')
103103
from androidJavadocs.destinationDir
104104
}
105105

106106
//将源码打包,生成sources.jar
107-
task androidSourcesJar(type: Jar) {
107+
tasks.register('androidSourcesJar', Jar) {
108108
archiveClassifier.set('sources')
109109
from android.sourceSets.main.java.srcDirs
110110
}

stateLayout/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ android {
3030
}
3131

3232
dependencies {
33-
implementation 'androidx.core:core-ktx:1.10.1'
34-
implementation 'androidx.appcompat:appcompat:1.7.0-alpha02'
35-
implementation 'com.google.android.material:material:1.11.0-alpha01'
33+
implementation 'androidx.core:core-ktx:1.12.0'
34+
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
35+
implementation 'com.google.android.material:material:1.11.0-alpha03'
36+
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
3637
}
3738

3839
ext {

stateLayout/src/main/java/com/chooongg/widget/stateLayout/StateLayout.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,13 +581,17 @@ open class StateLayout @JvmOverloads constructor(
581581
override fun dispatchNestedPreFling(velocityX: Float, velocityY: Float) =
582582
childHelper.dispatchNestedPreFling(velocityX, velocityY)
583583

584+
override fun getNestedScrollAxes(): Int {
585+
return parentHelper.nestedScrollAxes
586+
}
587+
584588
override fun onStartNestedScroll(child: View, target: View, axes: Int, type: Int): Boolean {
585-
childHelper.startNestedScroll(axes, type)
586589
return true
587590
}
588591

589592
override fun onNestedScrollAccepted(child: View, target: View, axes: Int, type: Int) {
590593
parentHelper.onNestedScrollAccepted(child, target, axes, type)
594+
childHelper.startNestedScroll(axes, type)
591595
}
592596

593597
override fun onStopNestedScroll(target: View, type: Int) {

0 commit comments

Comments
 (0)