Skip to content

Commit 688afee

Browse files
youlookwhatyoulookwhat
committed
update targetSdk 34
1 parent 8a135ea commit 688afee

File tree

13 files changed

+109
-83
lines changed

13 files changed

+109
-83
lines changed

‎ByRecyclerview/build.gradle‎

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,34 @@
1-
apply plugin: 'com.android.library'
1+
//apply plugin: 'com.android.library'
2+
//apply plugin: 'com.github.dcendents.android-maven'
3+
//group = 'com.github.youlookwhat'
4+
plugins {
5+
id 'com.android.library'
6+
id 'org.jetbrains.kotlin.android'
7+
id 'maven-publish'
8+
}
9+
10+
afterEvaluate {
11+
publishing {
12+
publications {
13+
release(MavenPublication) {
14+
from components.release
15+
groupId = 'me.jingbin.library'
16+
artifactId = 'ByRecyclerView'
17+
version = '1.4.1'
18+
}
19+
}
20+
}
21+
}
222

3-
apply plugin: 'com.github.dcendents.android-maven'
4-
group = 'com.github.youlookwhat'
523

6-
android {
7-
compileSdkVersion 29
824

25+
android {
26+
namespace 'me.jingbin.library'
27+
compileSdk 34
928

1029
defaultConfig {
11-
minSdkVersion 14
12-
targetSdkVersion 29
13-
versionCode 1
14-
versionName "1.0"
30+
minSdk 14
31+
targetSdk 34
1532

1633
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1734

@@ -28,7 +45,8 @@ android {
2845
dependencies {
2946
implementation fileTree(dir: 'libs', include: ['*.jar'])
3047

48+
compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
3149
// AppBarLayout
32-
compileOnly 'com.google.android.material:material:1.5.0'
33-
compileOnly 'androidx.recyclerview:recyclerview:1.2.1'
50+
compileOnly 'com.google.android.material:material:1.10.0'
51+
compileOnly 'androidx.recyclerview:recyclerview:1.3.0'
3452
}

‎app/build.gradle‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,19 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
2+
//apply plugin: 'kotlin-android'
3+
apply plugin: 'org.jetbrains.kotlin.android'
44

55
android {
6-
compileSdkVersion 30
6+
namespace 'me.jingbin.byrecyclerview'
7+
compileSdk 34
78
defaultConfig {
89
applicationId "me.jingbin.byrecyclerview"
9-
minSdkVersion 21
10-
targetSdkVersion 30
10+
minSdk 21
11+
targetSdk 34
1112
versionCode 12
1213
versionName "1.4.1"
1314
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1415
multiDexEnabled true
1516
}
16-
buildTypes {
17-
release {
18-
minifyEnabled false
19-
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
20-
}
21-
}
22-
23-
// gradle link错误终止编译
24-
lintOptions {
25-
abortOnError false
26-
}
27-
28-
// 主app也需要
29-
dataBinding {
30-
enabled = true
31-
}
32-
33-
// 其他 ByRecyclerview
3417
signingConfigs {
3518
release {
3619
storeFile file("./ByRecyclerView")
@@ -45,7 +28,6 @@ android {
4528
keyPassword "ByRecyclerView"
4629
}
4730
}
48-
4931
buildTypes {
5032
release {
5133
minifyEnabled false
@@ -64,6 +46,25 @@ android {
6446
signingConfig signingConfigs.debug
6547
}
6648
}
49+
lintOptions {
50+
abortOnError false
51+
}
52+
buildFeatures {
53+
dataBinding = true
54+
buildConfig = true
55+
}
56+
57+
compileOptions {
58+
targetCompatibility JavaVersion.VERSION_17
59+
sourceCompatibility JavaVersion.VERSION_17
60+
}
61+
62+
// gradle link错误终止编译
63+
64+
// 主app也需要
65+
66+
// 其他 ByRecyclerview
67+
6768
}
6869

6970
// 获取时间
@@ -85,13 +86,14 @@ dependencies {
8586
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
8687
implementation 'androidx.multidex:multidex:2.0.1'
8788
// 状态栏
88-
implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
89+
implementation 'com.geyifeng.immersionbar:immersionbar:3.2.2'
8990
// 流式布局
90-
implementation 'com.google.android:flexbox:2.0.1'
91+
implementation 'com.google.android.flexbox:flexbox:3.0.0'
9192
implementation project(':ByRecyclerview')
9293
// implementation "com.github.youlookwhat:ByRecyclerView:1.3.1"
9394
// 支持CoordinatorLayout的下拉刷新
94-
implementation 'com.scwang.smartrefresh:SmartRefreshLayout:1.1.0'
95+
implementation 'io.github.scwang90:refresh-layout-kernel:2.1.0'
96+
implementation 'io.github.scwang90:refresh-header-classics:2.1.0'
9597
// 解决[CoordinatorLayout 嵌套滑动置顶(惯性滑动方案)]反射问题
9698
implementation 'com.github.tiann:FreeReflection:3.1.0'
9799
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,41 @@
1414
tools:ignore="GoogleAppIndexingWarning">
1515

1616
<activity
17-
android:name=".MainActivity"
17+
android:name="me.jingbin.byrecyclerview.MainActivity"
18+
android:exported="true"
1819
android:theme="@style/NoTitleTheme">
1920
<intent-filter>
2021
<action android:name="android.intent.action.MAIN" />
2122

2223
<category android:name="android.intent.category.LAUNCHER" />
2324
</intent-filter>
2425
</activity>
25-
<activity android:name=".activity.SimpleActivity" />
26-
<activity android:name=".activity.RefreshActivity" />
27-
<activity android:name=".activity.StateViewActivity" />
28-
<activity android:name=".activity.HeaderFooterActivity" />
29-
<activity android:name=".activity.ListViewActivity" />
30-
<activity android:name=".activity.AppBarLayoutActivity" />
31-
<activity android:name=".activity.DataBindingActivity" />
32-
<activity android:name=".activity.CustomLayoutActivity" />
33-
<activity android:name=".activity.DividerGridActivity" />
34-
<activity android:name=".activity.ItemClickActivity" />
35-
<activity android:name=".activity.StickyItemActivity" />
36-
<activity android:name=".activity.MultiTypeItemActivity" />
37-
<activity android:name=".activity.DividerLinearActivity" />
38-
<activity android:name=".activity.CustomHorizontalLayoutActivity" />
39-
<activity android:name=".activity.SkeletonListActivity" />
40-
<activity android:name=".activity.SkeletonGridActivity" />
41-
<activity android:name=".activity.SkeletonHeaderViewActivity" />
42-
<activity android:name=".activity.SkeletonViewActivity" />
43-
<activity android:name=".activity.SecondTypeActivity" />
44-
<activity android:name=".activity.FlexBoxActivity" />
45-
<activity android:name=".activity.StickyRvActivity" />
46-
<activity android:name=".activity.HorizontalGridDividerActivity" />
47-
<activity android:name=".activity.ItemPayloadActivity" />
48-
<activity android:name=".activity.LoadMoreActivity" />
49-
<activity android:name=".activity.StickyRvCoordinatorActivity" />
50-
<activity android:name=".activity.StickyRvCoordinatorOriginalActivity" />
26+
<activity android:name="me.jingbin.byrecyclerview.activity.SimpleActivity" />
27+
<activity android:name="me.jingbin.byrecyclerview.activity.RefreshActivity" />
28+
<activity android:name="me.jingbin.byrecyclerview.activity.StateViewActivity" />
29+
<activity android:name="me.jingbin.byrecyclerview.activity.HeaderFooterActivity" />
30+
<activity android:name="me.jingbin.byrecyclerview.activity.ListViewActivity" />
31+
<activity android:name="me.jingbin.byrecyclerview.activity.AppBarLayoutActivity" />
32+
<activity android:name="me.jingbin.byrecyclerview.activity.DataBindingActivity" />
33+
<activity android:name="me.jingbin.byrecyclerview.activity.CustomLayoutActivity" />
34+
<activity android:name="me.jingbin.byrecyclerview.activity.DividerGridActivity" />
35+
<activity android:name="me.jingbin.byrecyclerview.activity.ItemClickActivity" />
36+
<activity android:name="me.jingbin.byrecyclerview.activity.StickyItemActivity" />
37+
<activity android:name="me.jingbin.byrecyclerview.activity.MultiTypeItemActivity" />
38+
<activity android:name="me.jingbin.byrecyclerview.activity.DividerLinearActivity" />
39+
<activity android:name="me.jingbin.byrecyclerview.activity.CustomHorizontalLayoutActivity" />
40+
<activity android:name="me.jingbin.byrecyclerview.activity.SkeletonListActivity" />
41+
<activity android:name="me.jingbin.byrecyclerview.activity.SkeletonGridActivity" />
42+
<activity android:name="me.jingbin.byrecyclerview.activity.SkeletonHeaderViewActivity" />
43+
<activity android:name="me.jingbin.byrecyclerview.activity.SkeletonViewActivity" />
44+
<activity android:name="me.jingbin.byrecyclerview.activity.SecondTypeActivity" />
45+
<activity android:name="me.jingbin.byrecyclerview.activity.FlexBoxActivity" />
46+
<activity android:name="me.jingbin.byrecyclerview.activity.StickyRvActivity" />
47+
<activity android:name="me.jingbin.byrecyclerview.activity.HorizontalGridDividerActivity" />
48+
<activity android:name="me.jingbin.byrecyclerview.activity.ItemPayloadActivity" />
49+
<activity android:name="me.jingbin.byrecyclerview.activity.LoadMoreActivity" />
50+
<activity android:name="me.jingbin.byrecyclerview.activity.StickyRvCoordinatorActivity" />
51+
<activity android:name="me.jingbin.byrecyclerview.activity.StickyRvCoordinatorOriginalActivity" />
5152
</application>
5253

5354
</manifest>

‎app/src/main/java/me/jingbin/byrecyclerview/activity/SkeletonHeaderViewActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void onLoadMore() {
5757
skeletonScreen = BySkeleton
5858
.bindItem(binding.recyclerView)
5959
.adapter(mAdapter)
60-
.load(R.layout.layout_by_default_item_skeleton)
60+
.load(me.jingbin.library.R.layout.layout_by_default_item_skeleton)
6161
.shimmer(false)// 是否有动画
6262
.angle(30)// 微光角度
6363
.frozen(false) // 是否不可滑动

‎app/src/main/java/me/jingbin/byrecyclerview/activity/SkeletonListActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void onLoadMore() {
5757
.bindItem(binding.recyclerView)
5858
.adapter(mAdapter)// 必须设置adapter，且在此之前不要设置adapter
5959
.shimmer(false)// 是否有动画
60-
.load(R.layout.layout_by_default_item_skeleton)// item骨架图
60+
.load(me.jingbin.library.R.layout.layout_by_default_item_skeleton)// item骨架图
6161
.angle(30)// 微光角度
6262
.frozen(false) // 是否不可滑动
6363
.color(R.color.colorWhite)// 动画的颜色

‎app/src/main/java/me/jingbin/byrecyclerview/activity/StickyRvCoordinatorActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
import androidx.annotation.NonNull;
66

7-
import com.scwang.smartrefresh.layout.api.RefreshLayout;
8-
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
7+
8+
import com.scwang.smart.refresh.layout.api.RefreshLayout;
9+
import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
910

1011
import org.jetbrains.annotations.NotNull;
1112

‎app/src/main/java/me/jingbin/byrecyclerview/activity/StickyRvCoordinatorOriginalActivity.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
import androidx.annotation.NonNull;
66
import androidx.fragment.app.Fragment;
77

8-
import com.scwang.smartrefresh.layout.api.RefreshLayout;
9-
import com.scwang.smartrefresh.layout.listener.OnRefreshListener;
8+
9+
import com.scwang.smart.refresh.layout.api.RefreshLayout;
10+
import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
1011

1112
import org.jetbrains.annotations.NotNull;
1213

‎app/src/main/java/me/jingbin/byrecyclerview/stickrvcool/config/FeedsListFragment.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package me.jingbin.byrecyclerview.stickrvcool.config
33
import android.os.Bundle
44
import android.view.View
55
import androidx.fragment.app.Fragment
6-
import kotlinx.android.synthetic.main.fragment_feeds_list.*
76
import me.jingbin.byrecyclerview.R
87
import me.jingbin.byrecyclerview.adapter.FeedStaggerAdapter
98
import me.jingbin.byrecyclerview.stickrvcool.PersistentRecyclerView
@@ -21,7 +20,7 @@ class FeedsListFragment : Fragment(R.layout.fragment_feeds_list) {
2120
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
2221
super.onViewCreated(view, savedInstanceState)
2322

24-
this.recyclerView = this.recycler_view
23+
this.recyclerView = view.findViewById<PersistentRecyclerView>(R.id.recycler_view)
2524
val layoutManager = PersistentStaggeredGridLayoutManager(2)
2625
this.recyclerView!!.layoutManager = layoutManager
2726
recyclerView!!.addItemDecoration(GridSpaceItemDecoration(DensityUtil.dip2px(context, 8f)))

‎app/src/main/res/layout/activity_sticky_rv_coord.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools">
55

6-
<com.scwang.smartrefresh.layout.SmartRefreshLayout
6+
<com.scwang.smart.refresh.layout.SmartRefreshLayout
77
android:id="@+id/main_refresh_layout"
88
android:layout_width="match_parent"
99
android:layout_height="0dp"
@@ -13,7 +13,7 @@
1313
app:srlEnableOverScrollBounce="false"
1414
app:srlReboundDuration="600">
1515

16-
<com.scwang.smartrefresh.layout.header.ClassicsHeader
16+
<com.scwang.smart.refresh.header.ClassicsHeader
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
app:srlAccentColor="@color/color_4"
@@ -152,7 +152,7 @@
152152

153153
</me.jingbin.byrecyclerview.stickrvcool.PersistentCoordinatorLayout>
154154

155-
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
155+
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
156156

157157

158158
</layout>

‎app/src/main/res/layout/activity_sticky_rv_coord_original.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:tools="http://schemas.android.com/tools">
55

66
<!--app:srlEnableOverScrollBounce="false" 关闭越界回弹功能-->
7-
<com.scwang.smartrefresh.layout.SmartRefreshLayout
7+
<com.scwang.smart.refresh.layout.SmartRefreshLayout
88
android:id="@+id/main_refresh_layout"
99
android:layout_width="match_parent"
1010
android:layout_height="0dp"
@@ -13,7 +13,7 @@
1313
app:srlAccentColor="#fff"
1414
app:srlReboundDuration="600">
1515

16-
<com.scwang.smartrefresh.layout.header.ClassicsHeader
16+
<com.scwang.smart.refresh.header.ClassicsHeader
1717
android:layout_width="match_parent"
1818
android:layout_height="wrap_content"
1919
app:srlAccentColor="@color/color_4"
@@ -70,7 +70,7 @@
7070

7171
</androidx.coordinatorlayout.widget.CoordinatorLayout>
7272

73-
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
73+
</com.scwang.smart.refresh.layout.SmartRefreshLayout>
7474

7575

7676
</layout>

0 commit comments

Comments
 (0)