Skip to content

Commit cf2a4cc

Browse files
committed
build: bump kotlinpoet to 1.16.0
Address breaking changes
1 parent b99f498 commit cf2a4cc

10 files changed

+22
-20
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ ext {
8585
kotlinxCoroutinesVersion = '1.7.3'
8686
lottieVersion = '6.1.0'
8787
philjayMpAndroidChartVersion = 'v3.1.0'
88-
squareupKotlinPoetVersion = '1.6.0'
88+
squareupKotlinPoetVersion = '1.16.0'
8989
squareupOkioVersion = '3.6.0'
9090
squareupRetrofitVersion = '2.9.0'
9191
uCropVersion = '2.2.8'

libs/processors/src/main/java/org/wordpress/android/processor/FeaturesInDevelopmentDefaultsBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ class FeaturesInDevelopmentDefaultsBuilder(private val featuresInDevelopment: Li
2828
.build()
2929
return FileSpec.builder("org.wordpress.android.util.config", "FeaturesInDevelopment")
3030
.addType(remoteConfigDefaults)
31-
.addComment("Automatically generated file. DO NOT MODIFY")
31+
.addFileComment("Automatically generated file. DO NOT MODIFY")
3232
.indent(" ")
3333
.build()
3434
}

libs/processors/src/main/java/org/wordpress/android/processor/RemoteConfigProcessor.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package org.wordpress.android.processor
22

33
import com.google.auto.service.AutoService
4+
import com.squareup.kotlinpoet.DelicateKotlinPoetApi
45
import com.squareup.kotlinpoet.TypeName
56
import com.squareup.kotlinpoet.asTypeName
67
import org.wordpress.android.annotation.Experiment
@@ -26,6 +27,7 @@ import javax.tools.Diagnostic.Kind
2627
"org.wordpress.android.annotation.RemoteFieldDefaultGenerater"
2728
)
2829
class RemoteConfigProcessor : AbstractProcessor() {
30+
@OptIn(DelicateKotlinPoetApi::class)
2931
@Suppress("DEPRECATION")
3032
override fun process(p0: MutableSet<out TypeElement>?, roundEnvironment: RoundEnvironment?): Boolean {
3133
val experiments = roundEnvironment?.getElementsAnnotatedWith(Experiment::class.java)?.map { element ->

libs/processors/src/main/java/org/wordpress/android/processor/RemoteFeatureConfigCheckBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class RemoteFeatureConfigCheckBuilder(private val remoteFeatures: List<TypeName>
4242
.build()
4343
return FileSpec.builder("org.wordpress.android.util.config", "RemoteFeatureConfigCheck")
4444
.addType(remoteFeatureConfigDefaults)
45-
.addComment("Automatically generated file. DO NOT MODIFY")
45+
.addFileComment("Automatically generated file. DO NOT MODIFY")
4646
.indent(" ")
4747
.build()
4848
}

libs/processors/src/main/java/org/wordpress/android/processor/RemoteFeatureConfigDefaultsBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RemoteFeatureConfigDefaultsBuilder(private val defaults: Map<String, Strin
3131
.build()
3232
return FileSpec.builder("org.wordpress.android.util.config", FILE_NAME)
3333
.addType(remoteConfigDefaults)
34-
.addComment("Automatically generated file. DO NOT MODIFY")
34+
.addFileComment("Automatically generated file. DO NOT MODIFY")
3535
.indent(" ")
3636
.build()
3737
}

libs/processors/src/main/java/org/wordpress/android/processor/RemoteFieldConfigDefaultsBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class RemoteFieldConfigDefaultsBuilder(private val defaults: Map<String, String>
3131
.build()
3232
return FileSpec.builder("org.wordpress.android.util.config", FILE_NAME)
3333
.addType(remoteConfigDefaults)
34-
.addComment("Automatically generated file. DO NOT MODIFY")
34+
.addFileComment("Automatically generated file. DO NOT MODIFY")
3535
.indent(" ")
3636
.build()
3737
}

libs/processors/src/test/kotlin/org/wordpress/android/processor/FeaturesInDevelopmentDefaultsBuilderTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class FeaturesInDevelopmentDefaultsBuilderTest {
2323
import kotlin.String
2424
import kotlin.collections.List
2525
26-
object FeaturesInDevelopment {
27-
val featuresInDevelopment: List<String> = listOf(
26+
public object FeaturesInDevelopment {
27+
public val featuresInDevelopment: List<String> = listOf(
2828
"$featureA",
2929
"$featureB"
3030
)
@@ -51,8 +51,8 @@ class FeaturesInDevelopmentDefaultsBuilderTest {
5151
import kotlin.String
5252
import kotlin.collections.List
5353
54-
object FeaturesInDevelopment {
55-
val featuresInDevelopment: List<String> = listOf(
54+
public object FeaturesInDevelopment {
55+
public val featuresInDevelopment: List<String> = listOf(
5656
)
5757
}
5858

libs/processors/src/test/kotlin/org/wordpress/android/processor/RemoteFeatureConfigCheckBuilderTest.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ class RemoteFeatureConfigCheckBuilderTest {
2828
import org.wordpress.$classA
2929
import org.wordpress.$classB
3030
31-
class RemoteFeatureConfigCheck(
32-
val appConfig: AppConfig
31+
public class RemoteFeatureConfigCheck(
32+
public val appConfig: AppConfig,
3333
) {
34-
val $classA: $classA = $classA(appConfig)
34+
public val $classA: $classA = $classA(appConfig)
3535
36-
val $classB: $classB = $classB(appConfig)
36+
public val $classB: $classB = $classB(appConfig)
3737
38-
fun checkRemoteFields() {
38+
public fun checkRemoteFields() {
3939
if ($classA.remoteField == null) {
4040
throw IllegalArgumentException(""${'"'}org.wordpress.$classA needs to define
4141
remoteField""${'"'})

libs/processors/src/test/kotlin/org/wordpress/android/processor/RemoteFeatureConfigDefaultsBuilderTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ class RemoteFeatureConfigDefaultsBuilderTest {
2424
import kotlin.String
2525
import kotlin.collections.Map
2626
27-
object RemoteFeatureConfigDefaults {
28-
val remoteFeatureConfigDefaults: Map<String, Any> = mapOf(
27+
public object RemoteFeatureConfigDefaults {
28+
public val remoteFeatureConfigDefaults: Map<String, Any> = mapOf(
2929
"$keyA" to "$valueA",
3030
"$keyB" to "$valueB"
3131
)

libs/processors/src/test/kotlin/org/wordpress/android/processor/RemoteFieldConfigDefaultsBuilderTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class RemoteFieldConfigDefaultsBuilderTest {
2626
import kotlin.String
2727
import kotlin.collections.Map
2828
29-
object RemoteFieldConfigDefaults {
30-
val remoteFieldConfigDefaults: Map<String, Any> = mapOf(
29+
public object RemoteFieldConfigDefaults {
30+
public val remoteFieldConfigDefaults: Map<String, Any> = mapOf(
3131
"$keyA" to "$valueA",
3232
"$keyB" to "$valueB"
3333
)
@@ -55,8 +55,8 @@ class RemoteFieldConfigDefaultsBuilderTest {
5555
import kotlin.String
5656
import kotlin.collections.Map
5757
58-
object RemoteFieldConfigDefaults {
59-
val remoteFieldConfigDefaults: Map<String, Any> = mapOf(
58+
public object RemoteFieldConfigDefaults {
59+
public val remoteFieldConfigDefaults: Map<String, Any> = mapOf(
6060
)
6161
}
6262

0 commit comments

Comments
 (0)