Skip to content

Commit fc98ed3

Browse files
committed
Merge remote-tracking branch 'origin/remove-kapt' into response-type-keeper-ksp
# Conflicts: # retrofit-response-type-keeper/build.gradle
2 parents b5e403b + ce4bb50 commit fc98ed3

7 files changed

Lines changed: 14 additions & 29 deletions

File tree

gradle/libs.versions.toml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414

1515
[versions]
1616
kotlin = "2.2.21"
17-
okhttp = "5.2.1"
17+
okhttp = "5.3.0"
1818
protobuf = "3.25.8"
1919
robovm = "2.3.14"
2020
kotlinx-serialization = "1.9.0"
2121
kct = "0.10.0"
2222
autoService = "1.1.1"
2323
incap = "1.0.0"
24-
jackson = "2.20.0"
24+
jackson = "2.20.1"
2525

2626
[libraries]
2727
androidPlugin = { module = "com.android.tools.build:gradle", version = "8.13.0" }
@@ -47,12 +47,6 @@ protobufPlugin = "com.google.protobuf:protobuf-gradle-plugin:0.9.5"
4747
protobuf = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
4848
protoc = { module = "com.google.protobuf:protoc", version.ref = "protobuf" }
4949

50-
incap-runtime = { module = "net.ltgt.gradle.incap:incap", version.ref = "incap" }
51-
incap-processor = { module = "net.ltgt.gradle.incap:incap-processor", version.ref = "incap" }
52-
53-
autoService-annotations = { module = "com.google.auto.service:auto-service-annotations", version.ref = "autoService" }
54-
autoService-compiler = { module = "com.google.auto.service:auto-service", version.ref = "autoService" }
55-
5650
kotlinx-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version = "1.10.2" }
5751
kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
5852
kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinx-serialization" }

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

retrofit-response-type-keeper/build.gradle

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
apply plugin: 'org.jetbrains.kotlin.jvm'
2-
apply plugin: 'org.jetbrains.kotlin.kapt'
32
apply plugin: 'com.vanniktech.maven.publish'
43

54
dependencies {
6-
compileOnly libs.autoService.annotations
7-
compileOnly libs.incap.runtime
85
compileOnly libs.ksp.api
9-
kapt libs.autoService.compiler
10-
kapt libs.incap.processor
116

127
testImplementation libs.junit
138
testImplementation libs.compileTesting

retrofit-response-type-keeper/src/main/kotlin/retrofit2/keeper/RetrofitResponseTypeKeepProcessor.kt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
*/
1616
package retrofit2.keeper
1717

18-
import com.google.auto.service.AutoService
1918
import javax.annotation.processing.AbstractProcessor
20-
import javax.annotation.processing.Processor
2119
import javax.annotation.processing.RoundEnvironment
2220
import javax.lang.model.SourceVersion
2321
import javax.lang.model.element.ExecutableElement
@@ -26,11 +24,7 @@ import javax.lang.model.type.DeclaredType
2624
import javax.lang.model.type.TypeMirror
2725
import javax.lang.model.type.WildcardType
2826
import javax.tools.StandardLocation.CLASS_OUTPUT
29-
import net.ltgt.gradle.incap.IncrementalAnnotationProcessor
30-
import net.ltgt.gradle.incap.IncrementalAnnotationProcessorType.ISOLATING
3127

32-
@AutoService(Processor::class)
33-
@IncrementalAnnotationProcessor(ISOLATING)
3428
class RetrofitResponseTypeKeepProcessor : AbstractProcessor() {
3529
override fun getSupportedSourceVersion() = SourceVersion.latestSupported()
3630
override fun getSupportedAnnotationTypes() = annotationNames
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
retrofit2.keeper.RetrofitResponseTypeKeepProcessor,ISOLATING
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
retrofit2.keeper.RetrofitResponseTypeKeepProcessor

website/package-lock.json

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

0 commit comments

Comments
 (0)