Skip to content

Commit 702c776

Browse files
elihartelihart
authored
Update kotlin and ksp for 1.7.20 (#1320)
* delete old paging library and update kotlin versions. compilation passes * Update kotlin and ksp for 1.7.20 * release 5.1.0
1 parent db4f47a commit 702c776

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+121
-1821
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# 5.1.0
2+
Updates Kotlin to 1.7.20 and KSP to 1.7.20-1.0.7, as well as the room compiler processing (xprocessing) library to 2.5.0-beta01.
3+
4+
Also deletes the epoxy-paging artifact in favor of the newer epoxy-paging3
5+
16
# 5.0.0
27
This adds support for Kotlin Symbol Processing, while maintaining backwards compatibility with java annotation processing via the xprocessing library from Room.
38

‎blessedDeps.gradle‎

Lines changed: 62 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ rootProject.ext.ANDROIDX_FRAGMENT_TESTING = "1.3.3"
2727
rootProject.ext.ANDROIDX_LEGACY = "1.0.0"
2828
rootProject.ext.ANDROIDX_MATERIAL = "1.3.0"
2929
rootProject.ext.ANDROIDX_PAGING = "2.0.0"
30-
rootProject.ext.ANDROIDX_PAGING3 = "3.0.0"
31-
rootProject.ext.ANDROIDX_RECYCLERVIEW = "1.3.0-beta01"
32-
rootProject.ext.ANDROIDX_ROOM = "2.4.2"
30+
rootProject.ext.ANDROIDX_PAGING3 = "3.1.1"
31+
rootProject.ext.ANDROIDX_RECYCLERVIEW = "1.3.0-rc01"
32+
rootProject.ext.ANDROIDX_ROOM = "2.5.0-beta01"
3333
rootProject.ext.ANDROIDX_RUNTIME = "2.3.1"
3434
rootProject.ext.ANDROIDX_VERSIONED_PARCELABLE = "1.1.1"
3535
rootProject.ext.ANDROID_ARCH_TESTING = "2.1.0"
@@ -41,7 +41,7 @@ rootProject.ext.AUTO_VALUE_VERSION = "1.7.4"
4141
rootProject.ext.GLIDE_VERSION = "4.12.0"
4242
rootProject.ext.GOOGLE_TESTING_COMPILE_VERSION = "0.19"
4343
rootProject.ext.INCAP_VERSION = "0.3"
44-
rootProject.ext.JUNIT_VERSION = "4.13.1"
44+
rootProject.ext.JUNIT_VERSION = "4.13.2"
4545
rootProject.ext.KOTLIN_COROUTINES_VERSION = "1.6.4"
4646
rootProject.ext.KOTLINX_METADATA = "0.5.0"
4747
rootProject.ext.LOTTIE_VERSION = "2.8.0"
@@ -50,62 +50,66 @@ rootProject.ext.PARIS_VERSION = "2.0.1"
5050
rootProject.ext.ROBOLECTRIC_VERSION = "4.5.1"
5151
rootProject.ext.SQUARE_JAVAPOET_VERSION = "1.13.0"
5252
rootProject.ext.SQUARE_KOTLINPOET_VERSION = "1.12.0"
53-
rootProject.ext.COMPOSE_COMPILER_VERSION = "1.2.0"
54-
rootProject.ext.COMPOSE_VERSION = "1.2.1"
53+
rootProject.ext.COMPOSE_COMPILER_VERSION = "1.3.2"
54+
rootProject.ext.COMPOSE_VERSION = "1.3.0-rc01"
5555
rootProject.ext.COMPOSE_ACTIVITY_VERSION = "1.6.0"
56-
rootProject.ext.KOTLINX_LIFECYCLE_RUNTIME_VERSION = "2.3.0"
57-
rootProject.ext.KSP_VERSION = "1.7.0-1.0.6"
58-
rootProject.ext.XPROCESSING_VERSION = "2.5.0-alpha02"
56+
rootProject.ext.KOTLINX_LIFECYCLE_RUNTIME_VERSION = "2.5.1"
57+
rootProject.ext.KSP_VERSION = "1.7.20-1.0.7"
58+
rootProject.ext.XPROCESSING_VERSION = "2.5.0-beta01"
5959
rootProject.ext.KOTLIN_TESTING_COMPILE_VERSION = '1.4.9'
60+
rootProject.ext.LIFECYCLE_VIEWMODEL = '2.5.1'
6061

6162
rootProject.ext.deps = [
62-
activityCompose : "androidx.activity:activity-compose:$COMPOSE_ACTIVITY_VERSION",
63-
androidAnnotations : "androidx.annotation:annotation:$ANDROIDX_ANNOTATION",
64-
androidAppcompat : "androidx.appcompat:appcompat:$ANDROIDX_APPCOMPAT",
65-
androidArchCoreTesting : "androidx.arch.core:core-testing:$ANDROID_ARCH_TESTING",
66-
androidCardView : "androidx.cardview:cardview:$ANDROIDX_CARDVIEW",
67-
androidCoreKtx : "androidx.core:core-ktx:$ANDROIDX_CORE_KTX",
68-
androidDesignLibrary : "com.google.android.material:material:$ANDROIDX_MATERIAL",
69-
androidEspressoCore : "androidx.test.espresso:espresso-core:$ANDROIDX_ESPRESSO_CORE",
70-
androidFragmentTesting : "androidx.fragment:fragment-testing:$ANDROIDX_FRAGMENT_TESTING",
71-
androidLifecycleRuntimeKtx: "androidx.lifecycle:lifecycle-runtime-ktx:$KOTLINX_LIFECYCLE_RUNTIME_VERSION",
72-
androidPaging3Component : "androidx.paging:paging-runtime:$ANDROIDX_PAGING3",
73-
androidPagingComponent : "androidx.paging:paging-runtime:$ANDROIDX_PAGING",
74-
androidRecyclerView : "androidx.recyclerview:recyclerview:$ANDROIDX_RECYCLERVIEW",
75-
androidRuntime : "com.google.android:android:$ANDROID_RUNTIME_VERSION",
76-
androidTestCore : "androidx.test:core:1.3.0",
77-
androidTestExtJunitKtx : "androidx.test.ext:junit-ktx:1.1.2",
78-
androidTestRules : "androidx.test:rules:$ANDROID_TEST_RUNNER",
79-
androidTestRunner : "androidx.test:runner:$ANDROID_TEST_RUNNER",
80-
assertj : "org.assertj:assertj-core:$ASSERTJ_VERSION",
81-
autoValue : "com.google.auto.value:auto-value:$AUTO_VALUE_VERSION",
82-
composeMaterial : "androidx.compose.material:material:$COMPOSE_VERSION",
83-
composeUi : "androidx.compose.ui:ui:$COMPOSE_VERSION",
84-
composeUiTooling : "androidx.compose.ui:ui-tooling:$COMPOSE_VERSION",
85-
dataBindingAdapters : "androidx.databinding:databinding-adapters:$ANDROIDX_DATABINDING_ADAPTERS",
86-
dataBindingLibrary : "androidx.databinding:databinding-library:$ANDROIDX_DATABINDING_LIBRARY",
87-
glide : "com.github.bumptech.glide:glide:$GLIDE_VERSION",
88-
googleTestingCompile : "com.google.testing.compile:compile-testing:$GOOGLE_TESTING_COMPILE_VERSION",
89-
incapProcessor : "net.ltgt.gradle.incap:incap-processor:$INCAP_VERSION",
90-
incapRuntime : "net.ltgt.gradle.incap:incap:$INCAP_VERSION",
91-
junit : "junit:junit:$JUNIT_VERSION",
92-
kotlinCoroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION",
93-
kotlinCoroutinesTest : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$KOTLIN_COROUTINES_VERSION",
94-
kotlinxMetadata : "org.jetbrains.kotlinx:kotlinx-metadata-jvm:$KOTLINX_METADATA",
95-
lottie : "com.airbnb.android:lottie:$LOTTIE_VERSION",
96-
mockito : "org.mockito:mockito-core:$MOCKITO_VERSION",
97-
mockito_inline : "org.mockito:mockito-inline:$MOCKITO_VERSION",
98-
paris : "com.airbnb.android:paris:$PARIS_VERSION",
99-
parisProcessor : "com.airbnb.android:paris-processor:$PARIS_VERSION",
100-
robolectric : "org.robolectric:robolectric:$ROBOLECTRIC_VERSION",
101-
squareJavaPoet : "com.squareup:javapoet:$SQUARE_JAVAPOET_VERSION",
102-
squareKotlinPoet : "com.squareup:kotlinpoet:$SQUARE_KOTLINPOET_VERSION",
103-
kotlinPoetJavaInterop : "com.squareup:kotlinpoet-javapoet:$SQUARE_KOTLINPOET_VERSION",
104-
kotlinPoetKspInterop : "com.squareup:kotlinpoet-ksp:$SQUARE_KOTLINPOET_VERSION",
105-
versionedParcelable : "androidx.versionedparcelable:versionedparcelable:$ANDROIDX_VERSIONED_PARCELABLE",
106-
ksp : "com.google.devtools.ksp:symbol-processing-api:$KSP_VERSION",
107-
kspImpl : "com.google.devtools.ksp:symbol-processing:$KSP_VERSION",
108-
xProcessing : "androidx.room:room-compiler-processing:$XPROCESSING_VERSION",
109-
xProcessingTesting : "androidx.room:room-compiler-processing-testing:$XPROCESSING_VERSION",
110-
kotlinCompileTesting : "com.github.tschuchortdev:kotlin-compile-testing-ksp:$KOTLIN_TESTING_COMPILE_VERSION",
63+
activityCompose : "androidx.activity:activity-compose:$COMPOSE_ACTIVITY_VERSION",
64+
androidAnnotations : "androidx.annotation:annotation:$ANDROIDX_ANNOTATION",
65+
androidAppcompat : "androidx.appcompat:appcompat:$ANDROIDX_APPCOMPAT",
66+
androidArchCoreTesting : "androidx.arch.core:core-testing:$ANDROID_ARCH_TESTING",
67+
androidCardView : "androidx.cardview:cardview:$ANDROIDX_CARDVIEW",
68+
androidCoreKtx : "androidx.core:core-ktx:$ANDROIDX_CORE_KTX",
69+
androidDesignLibrary : "com.google.android.material:material:$ANDROIDX_MATERIAL",
70+
androidEspressoCore : "androidx.test.espresso:espresso-core:$ANDROIDX_ESPRESSO_CORE",
71+
androidFragmentTesting : "androidx.fragment:fragment-testing:$ANDROIDX_FRAGMENT_TESTING",
72+
androidLifecycleRuntimeKtx : "androidx.lifecycle:lifecycle-runtime-ktx:$KOTLINX_LIFECYCLE_RUNTIME_VERSION",
73+
androidPaging3Component : "androidx.paging:paging-runtime:$ANDROIDX_PAGING3",
74+
androidPagingComponent : "androidx.paging:paging-runtime:$ANDROIDX_PAGING",
75+
androidRecyclerView : "androidx.recyclerview:recyclerview:$ANDROIDX_RECYCLERVIEW",
76+
androidRuntime : "com.google.android:android:$ANDROID_RUNTIME_VERSION",
77+
androidTestCore : "androidx.test:core:1.3.0",
78+
androidTestExtJunitKtx : "androidx.test.ext:junit-ktx:1.1.2",
79+
androidTestRules : "androidx.test:rules:$ANDROID_TEST_RUNNER",
80+
androidTestRunner : "androidx.test:runner:$ANDROID_TEST_RUNNER",
81+
assertj : "org.assertj:assertj-core:$ASSERTJ_VERSION",
82+
autoValue : "com.google.auto.value:auto-value:$AUTO_VALUE_VERSION",
83+
composeMaterial : "androidx.compose.material:material:$COMPOSE_VERSION",
84+
composeUi : "androidx.compose.ui:ui:$COMPOSE_VERSION",
85+
composeUiTooling : "androidx.compose.ui:ui-tooling:$COMPOSE_VERSION",
86+
dataBindingAdapters : "androidx.databinding:databinding-adapters:$ANDROIDX_DATABINDING_ADAPTERS",
87+
dataBindingLibrary : "androidx.databinding:databinding-library:$ANDROIDX_DATABINDING_LIBRARY",
88+
glide : "com.github.bumptech.glide:glide:$GLIDE_VERSION",
89+
googleTestingCompile : "com.google.testing.compile:compile-testing:$GOOGLE_TESTING_COMPILE_VERSION",
90+
incapProcessor : "net.ltgt.gradle.incap:incap-processor:$INCAP_VERSION",
91+
incapRuntime : "net.ltgt.gradle.incap:incap:$INCAP_VERSION",
92+
junit : "junit:junit:$JUNIT_VERSION",
93+
kotlinCoroutines : "org.jetbrains.kotlinx:kotlinx-coroutines-core:$KOTLIN_COROUTINES_VERSION",
94+
kotlinCoroutinesTest : "org.jetbrains.kotlinx:kotlinx-coroutines-test:$KOTLIN_COROUTINES_VERSION",
95+
kotlinxMetadata : "org.jetbrains.kotlinx:kotlinx-metadata-jvm:$KOTLINX_METADATA",
96+
lottie : "com.airbnb.android:lottie:$LOTTIE_VERSION",
97+
mockito : "org.mockito:mockito-core:$MOCKITO_VERSION",
98+
mockito_inline : "org.mockito:mockito-inline:$MOCKITO_VERSION",
99+
paris : "com.airbnb.android:paris:$PARIS_VERSION",
100+
parisProcessor : "com.airbnb.android:paris-processor:$PARIS_VERSION",
101+
robolectric : "org.robolectric:robolectric:$ROBOLECTRIC_VERSION",
102+
squareJavaPoet : "com.squareup:javapoet:$SQUARE_JAVAPOET_VERSION",
103+
squareKotlinPoet : "com.squareup:kotlinpoet:$SQUARE_KOTLINPOET_VERSION",
104+
kotlinPoetJavaInterop : "com.squareup:kotlinpoet-javapoet:$SQUARE_KOTLINPOET_VERSION",
105+
kotlinPoetKspInterop : "com.squareup:kotlinpoet-ksp:$SQUARE_KOTLINPOET_VERSION",
106+
versionedParcelable : "androidx.versionedparcelable:versionedparcelable:$ANDROIDX_VERSIONED_PARCELABLE",
107+
ksp : "com.google.devtools.ksp:symbol-processing-api:$KSP_VERSION",
108+
kspImpl : "com.google.devtools.ksp:symbol-processing:$KSP_VERSION",
109+
xProcessing : "androidx.room:room-compiler-processing:$XPROCESSING_VERSION",
110+
xProcessingTesting : "androidx.room:room-compiler-processing-testing:$XPROCESSING_VERSION",
111+
kotlinCompileTesting : "com.github.tschuchortdev:kotlin-compile-testing-ksp:$KOTLIN_TESTING_COMPILE_VERSION",
112+
kotlinAnnotationProcessingEmbeddable: "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:$KOTLIN_VERSION",
113+
lifecycleViewmodel : "androidx.lifecycle:lifecycle-viewmodel:$LIFECYCLE_VIEWMODEL",
114+
lifecycleViewmodelKtx : "androidx.lifecycle:lifecycle-viewmodel-ktx:$LIFECYCLE_VIEWMODEL",
111115
]

‎build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
33

4-
ext.KOTLIN_VERSION = "1.7.0"
4+
ext.KOTLIN_VERSION = "1.7.20"
55
ext.ANDROID_PLUGIN_VERSION = '7.2.1'
6-
ext.KSP_VERSION = '1.7.0-1.0.6'
6+
ext.KSP_VERSION = '1.7.20-1.0.7'
77

88
repositories {
99
google()

‎epoxy-integrationtest/build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ dependencies {
4545
implementation rootProject.deps.androidFragmentTesting
4646
implementation rootProject.deps.androidPagingComponent
4747
implementation rootProject.deps.androidRecyclerView
48+
implementation rootProject.deps.lifecycleViewmodel
49+
implementation rootProject.deps.lifecycleViewmodelKtx
4850
implementation project(':epoxy-adapter')
4951
implementation project(':epoxy-annotations')
5052
implementation project(':epoxy-databinding')
51-
implementation project(':epoxy-paging')
5253
implementation project(':epoxy-viewbinder')
5354

5455
kapt project(':epoxy-processor')

‎epoxy-integrationtest/src/test/java/com/airbnb/epoxy/PagingIntegrationTest_List.java‎

Lines changed: 0 additions & 65 deletions
This file was deleted.

‎epoxy-integrationtest/src/test/java/com/airbnb/epoxy/PagingIntegrationTest_PagedList.java‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎epoxy-modelfactorytest/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,8 @@ dependencies {
6161
testImplementation rootProject.deps.robolectric
6262
testImplementation files(rootProject.file("libs/rt.jar"))
6363
testImplementation files(rootProject.file("libs/tools.jar"))
64+
65+
// This is included in kotlinCompileTesting, but the version can be out of date with our kotlin
66+
// compiler version, so we include it to force the right version
67+
testImplementation rootProject.deps.kotlinAnnotationProcessingEmbeddable
6468
}

‎epoxy-paging/.gitignore‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎epoxy-paging/build.gradle‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)