Skip to content

Commit 27eb84f

Browse files
sangcomzsangcomz
committed
Merge branch 'release/1.1.0'
2 parents 57f505d + 980b9d7 commit 27eb84f

File tree

11 files changed

+90
-81
lines changed

11 files changed

+90
-81
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
StickyTimeLine is timeline view for android.
66

77
## What's New? :tada:
8-
- [Improvement] Move to MavenCentral
98
- [Improvement] lib version update
109

1110
## Result Screen

‎app/build.gradle‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
apply plugin: 'com.android.application'
22
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-android-extensions'
43

54
android {
65

7-
compileSdkVersion gradle.compileSdk
6+
compileSdk gradle.compileSdk
87
defaultConfig {
9-
minSdkVersion gradle.minSdk
10-
targetSdkVersion gradle.targetSdk
8+
minSdk gradle.minSdk
9+
targetSdk gradle.targetSdk
1110
versionName gradle.versionName
1211
versionCode gradle.versionCode
1312
applicationId "xyz.sangcomz.stickytimeline"
@@ -39,21 +38,29 @@ android {
3938

4039
}
4140
}
41+
42+
namespace 'xyz.sangcomz.stickytimeline'
43+
44+
compileOptions {
45+
sourceCompatibility JavaVersion.VERSION_17
46+
targetCompatibility JavaVersion.VERSION_17
47+
}
48+
49+
kotlinOptions {
50+
jvmTarget = '17'
51+
}
4252
}
4353

4454
dependencies {
4555
implementation fileTree(include: ['*.jar'], dir: 'libs')
4656
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
47-
implementation 'androidx.appcompat:appcompat:1.3.1'
57+
implementation 'androidx.appcompat:appcompat:1.6.1'
4858
implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
49-
implementation "androidx.recyclerview:recyclerview:1.2.1"
59+
implementation "androidx.recyclerview:recyclerview:1.3.2"
5060
implementation 'androidx.cardview:cardview:1.0.0'
5161
implementation project(':stickytimelineview')
5262

53-
54-
implementation "androidx.appcompat:appcompat:1.4.1"
55-
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
5663
testImplementation 'junit:junit:4.13.2'
57-
androidTestImplementation 'androidx.test:runner:1.4.0'
58-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
64+
androidTestImplementation 'androidx.test:runner:1.5.2'
65+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
5966
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="xyz.sangcomz.stickytimeline">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<application
65
android:allowBackup="true"

‎app/src/main/java/xyz/sangcomz/stickytimeline/MainActivity.kt‎

Lines changed: 41 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import androidx.appcompat.app.AppCompatActivity
66
import androidx.appcompat.content.res.AppCompatResources
77
import androidx.recyclerview.widget.LinearLayoutManager
88
import androidx.recyclerview.widget.RecyclerView
9-
import kotlinx.android.synthetic.main.activity_main.*
9+
import xyz.sangcomz.stickytimelineview.TimeLineRecyclerView
1010
import xyz.sangcomz.stickytimelineview.callback.SectionCallback
11-
import xyz.sangcomz.stickytimelineview.decoration.VerticalSectionItemDecoration
1211
import xyz.sangcomz.stickytimelineview.model.SectionInfo
1312

1413
class MainActivity : AppCompatActivity() {
@@ -39,52 +38,50 @@ class MainActivity : AppCompatActivity() {
3938

4039
private fun initVerticalRecyclerView() {
4140
val singerList = getSingerList()
42-
vertical_recycler_view.adapter = SingerAdapter(
43-
layoutInflater,
44-
singerList,
45-
R.layout.recycler_vertical_row
46-
)
47-
48-
//Currently only LinearLayoutManager is supported.
49-
vertical_recycler_view.layoutManager = LinearLayoutManager(
50-
this,
51-
RecyclerView.VERTICAL,
52-
false
53-
)
54-
55-
vertical_recycler_view.addItemDecoration(getSectionCallback(singerList))
41+
findViewById<TimeLineRecyclerView>(R.id.vertical_recycler_view).apply {
42+
adapter = SingerAdapter(
43+
layoutInflater,
44+
singerList,
45+
R.layout.recycler_vertical_row
46+
)
47+
layoutManager = LinearLayoutManager(
48+
this@MainActivity,
49+
RecyclerView.VERTICAL,
50+
false
51+
)
52+
addItemDecoration(getSectionCallback(singerList))
53+
}
5654
}
5755

5856
private fun initHorizontalRecyclerView() {
5957
val singerList = getSingerList()
60-
horizontal_recycler_view.adapter = SingerAdapter(
61-
layoutInflater,
62-
singerList,
63-
R.layout.recycler_horizontal_row
64-
)
65-
66-
horizontal_recycler_view2.adapter = SingerAdapter(
67-
layoutInflater,
68-
singerList,
69-
R.layout.recycler_horizontal_row
70-
)
71-
72-
73-
//Currently only LinearLayoutManager is supported.
74-
horizontal_recycler_view.layoutManager = LinearLayoutManager(
75-
this,
76-
RecyclerView.HORIZONTAL,
77-
false
78-
)
79-
80-
horizontal_recycler_view2.layoutManager = LinearLayoutManager(
81-
this,
82-
RecyclerView.HORIZONTAL,
83-
false
84-
)
85-
86-
horizontal_recycler_view.addItemDecoration(getSectionCallback(singerList))
87-
horizontal_recycler_view2.addItemDecoration(getSectionCallbackWithDrawable(singerList))
58+
findViewById<TimeLineRecyclerView>(R.id.horizontal_recycler_view).apply {
59+
adapter = SingerAdapter(
60+
layoutInflater,
61+
singerList,
62+
R.layout.recycler_horizontal_row
63+
)
64+
layoutManager = LinearLayoutManager(
65+
this@MainActivity,
66+
RecyclerView.HORIZONTAL,
67+
false
68+
)
69+
addItemDecoration(getSectionCallback(singerList))
70+
}
71+
72+
findViewById<TimeLineRecyclerView>(R.id.horizontal_recycler_view2).apply {
73+
adapter = SingerAdapter(
74+
layoutInflater,
75+
singerList,
76+
R.layout.recycler_horizontal_row
77+
)
78+
layoutManager = LinearLayoutManager(
79+
this@MainActivity,
80+
RecyclerView.HORIZONTAL,
81+
false
82+
)
83+
addItemDecoration(getSectionCallbackWithDrawable(singerList))
84+
}
8885
}
8986

9087
//Get data method

‎build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
buildscript {
44

55
ext {
6-
kotlin_version = '1.6.10'
7-
constraint_version = '2.1.3'
6+
kotlin_version = '1.9.21'
7+
constraint_version = '2.1.4'
88
}
99

1010
repositories {
@@ -15,7 +15,7 @@ buildscript {
1515
}
1616
}
1717
dependencies {
18-
classpath 'com.android.tools.build:gradle:7.1.0'
18+
classpath 'com.android.tools.build:gradle:8.2.2'
1919
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2020
classpath "io.github.sabujak-sabujak:gradle-github-release-plugin:0.0.2"
2121
// NOTE: Do not place your application dependencies here; they belong

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12-
android.enableJetifier=true
12+
android.nonFinalResIds=false
13+
android.nonTransitiveRClass=false
1314
android.useAndroidX=true
1415
org.gradle.jvmargs=-Xmx1536m
1516

‎gradle/release.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ def siteUrl = 'https://github.com/sangcomz/StickyTimeLine' // Homepage URL
3232
def gitUrl = 'https://github.com/sangcomz/StickyTimeLine.git' // Git repository URL
3333

3434
afterEvaluate {
35-
3635
task sourceJar(type: Jar) {
3736
from android.sourceSets.main.java.srcDirs
3837
archiveClassifier.set("sources")
@@ -53,6 +52,7 @@ afterEvaluate {
5352
publications {
5453
// Creates a Maven publication called "release".
5554
release(MavenPublication) {
55+
tasks.named("generateMetadataFileForReleasePublication").configure { dependsOn("sourceJar") }
5656
groupId group
5757
artifactId archivesBaseName
5858
version version
@@ -62,7 +62,6 @@ afterEvaluate {
6262
} else {
6363
from components.java
6464
}
65-
artifact sourceJar
6665
artifact javadocJar
6766

6867
pom {
@@ -78,7 +77,7 @@ afterEvaluate {
7877
developers {
7978
developer {
8079
id = 'sangcomz'
81-
name = 'Swokwon Jeong'
80+
name = 'Seokwon Jeong'
8281
email = '[email protected]'
8382
}
8483
}
@@ -123,7 +122,6 @@ githubRelease {
123122
tagName = version
124123
targetCommitish = 'master'
125124
body = """## Release Note
126-
* [Improvement] Move to MavenCentral
127125
* [Improvement] lib version update
128126
"""
129127
name = version

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ 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-7.2-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip

‎settings.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
include ':app', ':stickytimelineview'
22

3-
gradle.ext.set('versionCode', 10)
4-
gradle.ext.set('versionName', '1.0.0')
3+
gradle.ext.set('versionCode', 11)
4+
gradle.ext.set('versionName', '1.1.0')
55

6-
gradle.ext.set('minSdk', 16)
7-
gradle.ext.set('targetSdk', 31)
8-
gradle.ext.set('compileSdk', 31)
6+
gradle.ext.set('minSdk', 21)
7+
gradle.ext.set('targetSdk', 34)
8+
gradle.ext.set('compileSdk', 34)

‎stickytimelineview/build.gradle‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ repositories {
66
}
77

88
android {
9-
compileSdkVersion gradle.compileSdk
9+
compileSdk gradle.compileSdk
1010
defaultConfig {
11-
minSdkVersion gradle.minSdk
12-
targetSdkVersion gradle.targetSdk
11+
minSdk gradle.minSdk
12+
targetSdk gradle.targetSdk
1313
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
}
1515

@@ -19,21 +19,30 @@ android {
1919
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2020
}
2121
}
22+
namespace 'xyz.sangcomz.stickytimelineview'
2223

24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_17
26+
targetCompatibility JavaVersion.VERSION_17
27+
}
28+
29+
kotlinOptions {
30+
jvmTarget = '17'
31+
}
2332
}
2433

2534
apply from: '../gradle/release.gradle'
2635

2736
dependencies {
2837
implementation fileTree(include: ['*.jar'], dir: 'libs')
2938
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
30-
implementation 'androidx.appcompat:appcompat:1.3.1'
31-
implementation 'androidx.recyclerview:recyclerview:1.2.1'
39+
implementation 'androidx.appcompat:appcompat:1.6.1'
40+
implementation 'androidx.recyclerview:recyclerview:1.3.2'
3241
implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
3342

3443
testImplementation 'junit:junit:4.13.2'
35-
androidTestImplementation 'androidx.test:runner:1.4.0'
36-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
44+
androidTestImplementation 'androidx.test:runner:1.5.2'
45+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
3746
}
3847

3948
tasks.withType(Javadoc).all {

0 commit comments

Comments
 (0)