Merge branch 'release/1.1.0'

sangcomz · Feb 27, 2024 · 27eb84f · 27eb84f
2 parents 57f505d + 980b9d7
commit 27eb84f
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 81 deletions.
diff --git a/README.md b/README.md
@@ -5,7 +5,6 @@
 StickyTimeLine is timeline view for android.
 
 ## What's New? :tada:
-- [Improvement] Move to MavenCentral
 - [Improvement] lib version update
 
  ## Result Screen

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,12 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
 
-    compileSdkVersion gradle.compileSdk
+    compileSdk gradle.compileSdk
     defaultConfig {
-        minSdkVersion gradle.minSdk
-        targetSdkVersion gradle.targetSdk
+        minSdk gradle.minSdk
+        targetSdk gradle.targetSdk
         versionName gradle.versionName
         versionCode gradle.versionCode
         applicationId "xyz.sangcomz.stickytimeline"
@@ -39,21 +38,29 @@ android {
 
         }
     }
+
+    namespace 'xyz.sangcomz.stickytimeline'
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
-    implementation "androidx.recyclerview:recyclerview:1.2.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation project(':stickytimelineview')
 
-
-    implementation "androidx.appcompat:appcompat:1.4.1"
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="xyz.sangcomz.stickytimeline">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/java/xyz/sangcomz/stickytimeline/MainActivity.kt b/app/src/main/java/xyz/sangcomz/stickytimeline/MainActivity.kt
@@ -6,9 +6,8 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.activity_main.*
+import xyz.sangcomz.stickytimelineview.TimeLineRecyclerView
 import xyz.sangcomz.stickytimelineview.callback.SectionCallback
-import xyz.sangcomz.stickytimelineview.decoration.VerticalSectionItemDecoration
 import xyz.sangcomz.stickytimelineview.model.SectionInfo
 
 class MainActivity : AppCompatActivity() {
@@ -39,52 +38,50 @@ class MainActivity : AppCompatActivity() {
 
     private fun initVerticalRecyclerView() {
         val singerList = getSingerList()
-        vertical_recycler_view.adapter = SingerAdapter(
-            layoutInflater,
-            singerList,
-            R.layout.recycler_vertical_row
-        )
-
-        //Currently only LinearLayoutManager is supported.
-        vertical_recycler_view.layoutManager = LinearLayoutManager(
-            this,
-            RecyclerView.VERTICAL,
-            false
-        )
-
-        vertical_recycler_view.addItemDecoration(getSectionCallback(singerList))
+        findViewById<TimeLineRecyclerView>(R.id.vertical_recycler_view).apply {
+            adapter = SingerAdapter(
+                layoutInflater,
+                singerList,
+                R.layout.recycler_vertical_row
+            )
+            layoutManager = LinearLayoutManager(
+                this@MainActivity,
+                RecyclerView.VERTICAL,
+                false
+            )
+            addItemDecoration(getSectionCallback(singerList))
+        }
     }
 
     private fun initHorizontalRecyclerView() {
         val singerList = getSingerList()
-        horizontal_recycler_view.adapter = SingerAdapter(
-            layoutInflater,
-            singerList,
-            R.layout.recycler_horizontal_row
-        )
-
-        horizontal_recycler_view2.adapter = SingerAdapter(
-            layoutInflater,
-            singerList,
-            R.layout.recycler_horizontal_row
-        )
-
-
-        //Currently only LinearLayoutManager is supported.
-        horizontal_recycler_view.layoutManager = LinearLayoutManager(
-            this,
-            RecyclerView.HORIZONTAL,
-            false
-        )
-
-        horizontal_recycler_view2.layoutManager = LinearLayoutManager(
-            this,
-            RecyclerView.HORIZONTAL,
-            false
-        )
-
-        horizontal_recycler_view.addItemDecoration(getSectionCallback(singerList))
-        horizontal_recycler_view2.addItemDecoration(getSectionCallbackWithDrawable(singerList))
+        findViewById<TimeLineRecyclerView>(R.id.horizontal_recycler_view).apply {
+            adapter = SingerAdapter(
+                layoutInflater,
+                singerList,
+                R.layout.recycler_horizontal_row
+            )
+            layoutManager = LinearLayoutManager(
+                this@MainActivity,
+                RecyclerView.HORIZONTAL,
+                false
+            )
+            addItemDecoration(getSectionCallback(singerList))
+        }
+
+        findViewById<TimeLineRecyclerView>(R.id.horizontal_recycler_view2).apply {
+            adapter = SingerAdapter(
+                layoutInflater,
+                singerList,
+                R.layout.recycler_horizontal_row
+            )
+            layoutManager = LinearLayoutManager(
+                this@MainActivity,
+                RecyclerView.HORIZONTAL,
+                false
+            )
+            addItemDecoration(getSectionCallbackWithDrawable(singerList))
+        }
     }
 
     //Get data method

diff --git a/build.gradle b/build.gradle
@@ -3,8 +3,8 @@
 buildscript {
 
     ext {
-        kotlin_version = '1.6.10'
-        constraint_version = '2.1.3'
+        kotlin_version = '1.9.21'
+        constraint_version = '2.1.4'
     }
 
     repositories {
@@ -15,7 +15,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.0'
+        classpath 'com.android.tools.build:gradle:8.2.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.github.sabujak-sabujak:gradle-github-release-plugin:0.0.2"
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 

diff --git a/gradle/release.gradle b/gradle/release.gradle
@@ -32,7 +32,6 @@ def siteUrl = 'https://github.com/sangcomz/StickyTimeLine'      // Homepage URL
 def gitUrl = 'https://github.com/sangcomz/StickyTimeLine.git'   // Git repository URL
 
 afterEvaluate {
-
     task sourceJar(type: Jar) {
         from android.sourceSets.main.java.srcDirs
         archiveClassifier.set("sources")
@@ -53,6 +52,7 @@ afterEvaluate {
         publications {
             // Creates a Maven publication called "release".
             release(MavenPublication) {
+                tasks.named("generateMetadataFileForReleasePublication").configure { dependsOn("sourceJar") }
                 groupId group
                 artifactId archivesBaseName
                 version version
@@ -62,7 +62,6 @@ afterEvaluate {
                 } else {
                     from components.java
                 }
-                artifact sourceJar
                 artifact javadocJar
 
                 pom {
@@ -78,7 +77,7 @@ afterEvaluate {
                     developers {
                         developer {
                             id = 'sangcomz'
-                            name = 'Swokwon Jeong'
+                            name = 'Seokwon Jeong'
                             email = '[email protected]'
                         }
                     }
@@ -123,7 +122,6 @@ githubRelease {
     tagName = version
     targetCommitish = 'master'
     body = """## Release Note
-* [Improvement] Move to MavenCentral
 * [Improvement] lib version update
 """
     name = version

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
diff --git a/settings.gradle b/settings.gradle
@@ -1,8 +1,8 @@
 include ':app', ':stickytimelineview'
 
-gradle.ext.set('versionCode', 10)
-gradle.ext.set('versionName', '1.0.0')
+gradle.ext.set('versionCode', 11)
+gradle.ext.set('versionName', '1.1.0')
 
-gradle.ext.set('minSdk', 16)
-gradle.ext.set('targetSdk', 31)
-gradle.ext.set('compileSdk', 31)
+gradle.ext.set('minSdk', 21)
+gradle.ext.set('targetSdk', 34)
+gradle.ext.set('compileSdk', 34)
diff --git a/stickytimelineview/build.gradle b/stickytimelineview/build.gradle
@@ -6,10 +6,10 @@ repositories {
 }
 
 android {
-    compileSdkVersion gradle.compileSdk
+    compileSdk gradle.compileSdk
     defaultConfig {
-        minSdkVersion gradle.minSdk
-        targetSdkVersion gradle.targetSdk
+        minSdk gradle.minSdk
+        targetSdk gradle.targetSdk
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
@@ -19,21 +19,30 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'xyz.sangcomz.stickytimelineview'
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = '17'
+    }
 }
 
 apply from: '../gradle/release.gradle'
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.3.1'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.2'
     implementation "androidx.constraintlayout:constraintlayout:$constraint_version"
 
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test:runner:1.4.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    androidTestImplementation 'androidx.test:runner:1.5.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 }
 
 tasks.withType(Javadoc).all {

diff --git a/stickytimelineview/src/main/AndroidManifest.xml b/stickytimelineview/src/main/AndroidManifest.xml
@@ -1,2 +1 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="xyz.sangcomz.stickytimelineview" />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" />