Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies! #8

Merged
merged 2 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Android library for the adapter view (RecyclerView, ViewPager, ViewPager2)
## Without data binding
```groovy
dependencies {
def antonioVersion = '1.0.7-alpha'
def antonioVersion = '1.0.8-alpha'

implementation "io.github.naverz:antonio:$antonioVersion"

Expand All @@ -23,7 +23,7 @@ dependencies {
implementation "io.github.naverz:antonio-paging3:$antonioVersion"

// You can implement additional dependencies as bellow, if you want to use AntonioAnnotation.
def antonioAnnotationVersion = '0.0.6-alpha'
def antonioAnnotationVersion = '0.0.7-alpha'
implementation "io.github.naverz:antonio-annotation:$antonioAnnotationVersion"
//For java (You must select only one of kapt, ksp and annotationProcessor)
annotationProcessor "io.github.naverz:antonio-compiler:$antonioAnnotationVersion"
Expand All @@ -36,7 +36,7 @@ dependencies {
## With data binding
```groovy
dependencies {
def antonioVersion = '1.0.7-alpha'
def antonioVersion = '1.0.8-alpha'

implementation "io.github.naverz:antonio-databinding:$antonioVersion"

Expand Down
7 changes: 3 additions & 4 deletions antonio-core-paging2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -33,8 +33,7 @@ android {
dependencies {
//noinspection GradleDependency
implementation Android.PAGING2
releaseImplementation Antonio.CORE
debugImplementation project(path: ":antonio-core")
implementation project(path: ":antonio-core")
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
androidTestImplementation Test.ESPRESSO
Expand Down
7 changes: 3 additions & 4 deletions antonio-core-paging3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -32,8 +32,7 @@ android {

dependencies {
implementation Android.PAGING3
releaseImplementation Antonio.CORE
debugImplementation project(path: ":antonio-core")
implementation project(path: ":antonio-core")
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
androidTestImplementation Test.ESPRESSO
Expand Down
6 changes: 3 additions & 3 deletions antonio-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -36,7 +36,7 @@ android {

dependencies {
implementation Android.FRAGMENT
implementation Android.LIFECYCLE_KTX
implementation Android.LIFECYCLE_LIVEDATA_KTX
implementation Android.RECYCLER_VIEW
implementation Android.VIEW_PAGER2
testImplementation Test.JUNIT
Expand Down
10 changes: 4 additions & 6 deletions antonio-databinding-paging2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -31,10 +31,8 @@ android {
}

dependencies {
releaseApi Antonio.PAGING2_CORE
debugApi project(path: ":antonio-core-paging2")
releaseImplementation Antonio.DATA_BINDING
debugImplementation project(path: ":antonio-databinding")
api project(path: ":antonio-core-paging2")
implementation project(path: ":antonio-databinding")
implementation Android.PAGING2
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
Expand Down
10 changes: 4 additions & 6 deletions antonio-databinding-paging3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -31,10 +31,8 @@ android {
}

dependencies {
releaseApi Antonio.PAGING3_CORE
debugApi project(path: ":antonio-core-paging3")
releaseImplementation Antonio.DATA_BINDING
debugImplementation project(path: ":antonio-databinding")
api project(path: ":antonio-core-paging3")
implementation project(path: ":antonio-databinding")
implementation Android.PAGING3
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
Expand Down
9 changes: 4 additions & 5 deletions antonio-databinding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK
buildFeatures {
dataBinding true
}
defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -39,11 +39,10 @@ android {

dependencies {
implementation Android.FRAGMENT
implementation Android.LIFECYCLE_KTX
implementation Android.LIFECYCLE_LIVEDATA_KTX
implementation Android.RECYCLER_VIEW
implementation Android.VIEW_PAGER2
releaseApi Antonio.CORE
debugApi project(path : ":antonio-core")
api project(path : ":antonio-core")
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
androidTestImplementation Test.ESPRESSO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ open class AntonioAutoBindingViewHolder(
this.lifecycleOwner ?: fragment?.viewLifecycleOwner ?: activity

private val lifecycleRegistry = LifecycleRegistry(this)
override val lifecycle: Lifecycle get() = lifecycleRegistry

init {
binding.lifecycleOwner = this
Expand All @@ -65,7 +66,6 @@ open class AntonioAutoBindingViewHolder(
}
}

override fun getLifecycle(): Lifecycle = lifecycleRegistry

override fun onBindViewHolder(data: AntonioModel, position: Int, payloads: List<Any>?) {
bindingVariableId?.let {
Expand Down
10 changes: 4 additions & 6 deletions antonio-paging2/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -31,10 +31,8 @@ android {
}

dependencies {
releaseApi Antonio.PAGING2_CORE
debugApi project(path: ":antonio-core-paging2")
releaseImplementation Antonio.NORMAL
debugImplementation project(path: ":antonio")
api project(path: ":antonio-core-paging2")
implementation project(path: ":antonio")
implementation Android.PAGING2
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
Expand Down
10 changes: 4 additions & 6 deletions antonio-paging3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -31,10 +31,8 @@ android {
}

dependencies {
releaseApi Antonio.PAGING3_CORE
debugApi project(path: ":antonio-core-paging3")
releaseImplementation Antonio.NORMAL
debugImplementation project(path: ":antonio")
api project(path: ":antonio-core-paging3")
implementation project(path: ":antonio")
implementation Android.PAGING3
testImplementation Test.JUNIT
androidTestImplementation Test.EXT_JUNIT
Expand Down
9 changes: 4 additions & 5 deletions antonio/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ android {
lintOptions {
abortOnError false
}
compileSdk 33
compileSdk DependenciesKt.COMPILE_SDK

defaultConfig {
minSdk 16
targetSdk 33
targetSdk DependenciesKt.TARGET_SDK

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand All @@ -35,11 +35,10 @@ android {

dependencies {
implementation Android.FRAGMENT
implementation Android.LIFECYCLE_KTX
implementation Android.LIFECYCLE_LIVEDATA_KTX
implementation Android.RECYCLER_VIEW
implementation Android.VIEW_PAGER2
releaseApi Antonio.CORE
debugApi project(path: ":antonio-core")
api project(path: ":antonio-core")
testImplementation Test.JUNIT
androidTestImplementation Test.ESPRESSO
androidTestImplementation Test.EXT_JUNIT
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@

package io.github.naverz.antonio.buildsrc

const val KOTLIN_VERSION = "1.6.10"
const val KSP_VERSION = "1.6.10-1.0.2"
const val TARGET_SDK = 34
const val COMPILE_SDK = 34

const val KOTLIN_VERSION = "1.9.20"
const val KSP_VERSION = "1.9.20-1.0.14"

object Antonio {
const val NAME = "Antonio"
const val VERSION_NAME = "1.0.7-alpha"
const val VERSION_NAME = "1.0.8-alpha"
const val CORE = "io.github.naverz:antonio-core:$VERSION_NAME"
const val PAGING2_CORE = "io.github.naverz:antonio-core-paging2:$VERSION_NAME"
const val PAGING3_CORE = "io.github.naverz:antonio-core-paging3:$VERSION_NAME"
Expand All @@ -35,7 +38,7 @@ object Antonio {
}

object AntonioAnnotation {
const val VERSION_NAME = "0.0.6-alpha"
const val VERSION_NAME = "0.0.7-alpha"
const val COMPILER = "io.github.naverz:antonio-compiler:${VERSION_NAME}"
const val ANNOTATION = "io.github.naverz:antonio-annotation:${VERSION_NAME}"
fun getVersionName(moduleName: String): String {
Expand All @@ -46,31 +49,30 @@ object AntonioAnnotation {

object Android {
const val PAGING2 = "androidx.paging:paging-runtime:2.1.2"
const val PAGING3 = "androidx.paging:paging-runtime:3.0.1"
const val FRAGMENT = "androidx.fragment:fragment-ktx:1.3.6"
const val LIFECYCLE_KTX = "androidx.lifecycle:lifecycle-livedata-ktx:2.3.1"
const val PAGING3 = "androidx.paging:paging-runtime:3.2.1"
const val FRAGMENT = "androidx.fragment:fragment-ktx:1.6.2"
const val LIFECYCLE_LIVEDATA_KTX = "androidx.lifecycle:lifecycle-livedata-ktx:2.6.2"
const val RECYCLER_VIEW = "androidx.recyclerview:recyclerview:1.2.1"
const val FLEX_BOX = "com.google.android.flexbox:flexbox:3.0.0"
const val VIEW_PAGER2 = "androidx.viewpager2:viewpager2:1.0.0"

// For sample module
const val LIFECYCLE_VIEW_MODEL_KTX = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.0-alpha03"
const val LIFECYCLE_LIVE_DATA_KTX = "androidx.lifecycle:lifecycle-livedata-ktx:2.4.0-alpha03"
const val CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.1.0"
const val ACTIVITY_KTX = "androidx.activity:activity-ktx:1.3.1"
const val MATERIAL = "com.google.android.material:material:1.4.0"
const val APP_COMPAT = "androidx.appcompat:appcompat:1.3.1"
const val CORE_KTX = "androidx.core:core-ktx:1.6.0"
const val LIFECYCLE_VIEW_MODEL_KTX = "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2"
const val CONSTRAINT_LAYOUT = "androidx.constraintlayout:constraintlayout:2.1.4"
const val ACTIVITY_KTX = "androidx.activity:activity-ktx:1.8.0"
const val MATERIAL = "com.google.android.material:material:1.10.0"
const val APP_COMPAT = "androidx.appcompat:appcompat:1.6.1"
const val CORE_KTX = "androidx.core:core-ktx:1.12.0"
}

object Nav {
const val FRAGMENT_KTX = "androidx.navigation:navigation-fragment-ktx:2.3.5"
const val UI_KTX = "androidx.navigation:navigation-ui-ktx:2.3.5"
const val FRAGMENT_KTX = "androidx.navigation:navigation-fragment-ktx:2.7.5"
const val UI_KTX = "androidx.navigation:navigation-ui-ktx:2.7.5"
}


object GradleDependency {
const val BUILD_GRADLE = "com.android.tools.build:gradle:7.0.4"
const val BUILD_GRADLE = "com.android.tools.build:gradle:7.4.1"
const val GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:${KOTLIN_VERSION}"
}

Expand All @@ -91,7 +93,7 @@ object Processor {
const val KSP = "com.google.devtools.ksp:symbol-processing-api:${KSP_VERSION}"
}

object Incap{
object Incap {
const val INCAP = "net.ltgt.gradle.incap:incap:0.3"
const val PROCESSOR = "net.ltgt.gradle.incap:incap-processor:0.3"
}
6 changes: 3 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Aug 20 02:10:17 KST 2021
#Sun Nov 12 21:12:05 KST 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading