Skip to content

Commit

Permalink
更新版本到1.0.4:更新Build版本和官方库版本
Browse files Browse the repository at this point in the history
  • Loading branch information
Chooongg committed Oct 13, 2023
1 parent 85d8768 commit 651d237
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 17 deletions.
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ android {

dependencies {
implementation project(path: ':stateLayout')
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha02'
implementation 'com.google.android.material:material:1.11.0-alpha01'
implementation 'androidx.constraintlayout:constraintlayout:2.2.0-alpha10'
implementation 'com.airbnb.android:lottie:6.0.0'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'com.google.android.material:material:1.11.0-alpha03'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'com.airbnb.android:lottie:6.1.0'
}
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id 'com.android.application' version '8.0.2' apply false
id 'com.android.library' version '8.0.2' apply false
id 'com.android.application' version '8.1.2' apply false
id 'com.android.library' version '8.1.2' apply false
id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
}

ext{
VERSION_NAME = '1.0.3'
VERSION_NAME = '1.0.4'
}
8 changes: 4 additions & 4 deletions publish.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ afterEvaluate {
publications {
release(MavenPublication) {
//添加这个,否则aar文件不上传
artifact(tasks.getByName("bundleReleaseAar"))
artifact(tasks.named("bundleReleaseAar"))
artifact(androidJavadocsJar)
artifact(androidSourcesJar)
groupId = GROUP_ID // 唯一标识(通常为模块包名,也可以任意)
Expand Down Expand Up @@ -91,20 +91,20 @@ afterEvaluate {
}

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

//将文档打包成jar,生成javadoc.jar
task androidJavadocsJar(type: Jar) {
tasks.register('androidJavadocsJar', Jar) {
// 指定文档名称
archiveClassifier.set('javadoc')
from androidJavadocs.destinationDir
}

//将源码打包,生成sources.jar
task androidSourcesJar(type: Jar) {
tasks.register('androidSourcesJar', Jar) {
archiveClassifier.set('sources')
from android.sourceSets.main.java.srcDirs
}
Expand Down
7 changes: 4 additions & 3 deletions stateLayout/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ android {
}

dependencies {
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha02'
implementation 'com.google.android.material:material:1.11.0-alpha01'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.appcompat:appcompat:1.7.0-alpha03'
implementation 'com.google.android.material:material:1.11.0-alpha03'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.2.0-alpha01'
}

ext {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -581,13 +581,17 @@ open class StateLayout @JvmOverloads constructor(
override fun dispatchNestedPreFling(velocityX: Float, velocityY: Float) =
childHelper.dispatchNestedPreFling(velocityX, velocityY)

override fun getNestedScrollAxes(): Int {
return parentHelper.nestedScrollAxes
}

override fun onStartNestedScroll(child: View, target: View, axes: Int, type: Int): Boolean {
childHelper.startNestedScroll(axes, type)
return true
}

override fun onNestedScrollAccepted(child: View, target: View, axes: Int, type: Int) {
parentHelper.onNestedScrollAccepted(child, target, axes, type)
childHelper.startNestedScroll(axes, type)
}

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

0 comments on commit 651d237

Please sign in to comment.