Skip to content

Commit fa247bd

Browse files
authored
chore(pluto): kapt to ksp migration (#273)
1 parent d8a3767 commit fa247bd

10 files changed

Lines changed: 27 additions & 27 deletions

File tree

build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ buildscript {
77
repositories {
88
maven { url "https://plugins.gradle.org/m2/" }
99
google()
10-
jcenter()
1110
mavenCentral()
1211
}
1312
dependencies {
@@ -17,18 +16,18 @@ buildscript {
1716

1817
// maven central dependencies
1918
classpath 'io.github.gradle-nexus:publish-plugin:1.1.0'
20-
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30'
19+
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0'
2120

2221
// ktlint & detekt dependencies
23-
classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.0"
22+
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.1.0"
2423
classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion"
2524
}
2625
}
2726

2827
allprojects {
2928
repositories {
3029
google()
31-
jcenter()
30+
mavenCentral()
3231

3332
// for testing Pluto staged repository
3433
maven { url "https://s01.oss.sonatype.org/content/groups/staging/" }

dependencies.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ ext {
44
compileSdkVersion = 33
55
buildToolsVersion = '32.0.0'
66

7-
kotlinVersion = '1.7.20'
7+
kotlinVersion = '1.8.21'
88
detektVersion = '1.19.0'
99

1010
androidXCoreVersion = '1.6.0'
1111
okhttpVersion = '4.9.1'
1212
roomsVersion = '2.5.1'
1313
moshiVersion = '1.13.0'
1414
navigationVersion = '2.4.1'
15-
composeCompileVersion = '1.3.2'
16-
composeVersion = '1.3.1'
15+
composeCompileVersion = '1.4.7'
16+
composeVersion = '1.4.0'
1717
composeMaterial3Version = '1.0.1'
1818
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Tue Feb 08 21:06:21 IST 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

pluto-plugins/plugins/exceptions/lib/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
44
id 'kotlin-parcelize'
5-
id 'kotlin-kapt'
5+
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
66
}
77

88
apply from: "$rootDir/scripts/build/utils.gradle"
@@ -65,8 +65,8 @@ dependencies {
6565
implementation "androidx.core:core-ktx:$androidXCoreVersion"
6666

6767
implementation "com.squareup.moshi:moshi:$moshiVersion"
68-
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
68+
ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
6969

7070
implementation "androidx.room:room-ktx:$roomsVersion"
71-
kapt "androidx.room:room-compiler:$roomsVersion"
71+
ksp "androidx.room:room-compiler:$roomsVersion"
7272
}

pluto-plugins/plugins/layout-inspector/lib/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
44
id 'kotlin-parcelize'
5-
id 'kotlin-kapt'
65
}
76

87
apply from: "$rootDir/scripts/build/utils.gradle"

pluto-plugins/plugins/logger/lib/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
44
id 'kotlin-parcelize'
5-
id 'kotlin-kapt'
5+
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
66
}
77

88
apply from: "$rootDir/scripts/build/utils.gradle"
@@ -63,10 +63,10 @@ dependencies {
6363
implementation 'androidx.navigation:navigation-ui-ktx:2.4.1'
6464
api 'com.jakewharton.timber:timber:5.0.1'
6565
implementation "com.squareup.moshi:moshi:$moshiVersion"
66-
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
66+
ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
6767

6868
implementation "androidx.room:room-ktx:$roomsVersion"
69-
kapt "androidx.room:room-compiler:$roomsVersion"
69+
ksp "androidx.room:room-compiler:$roomsVersion"
7070
}
7171

7272
task validateChanges {

pluto-plugins/plugins/network/lib/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
44
id 'kotlin-parcelize'
5-
id 'kotlin-kapt'
5+
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
66
}
77

88
apply from: "$rootDir/scripts/build/utils.gradle"
@@ -67,10 +67,10 @@ dependencies {
6767

6868
implementation "androidx.room:room-ktx:$roomsVersion"
6969
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
70-
kapt "androidx.room:room-compiler:$roomsVersion"
70+
ksp "androidx.room:room-compiler:$roomsVersion"
7171

7272
implementation "com.squareup.moshi:moshi:$moshiVersion"
73-
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
73+
ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
7474

7575
implementation 'androidx.browser:browser:1.4.0'
7676
testImplementation 'junit:junit:4.13.2'

pluto-plugins/plugins/rooms-database/lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
44
id 'kotlin-parcelize'
5-
id 'kotlin-kapt'
5+
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
66
}
77

88
apply from: "$rootDir/scripts/build/utils.gradle"
@@ -66,5 +66,5 @@ dependencies {
6666
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
6767

6868
implementation "androidx.room:room-ktx:$roomsVersion"
69-
kapt "androidx.room:room-compiler:$roomsVersion"
69+
ksp "androidx.room:room-compiler:$roomsVersion"
7070
}

pluto-plugins/plugins/shared-preferences/lib/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'com.android.library'
33
id 'kotlin-android'
4-
id 'kotlin-kapt'
4+
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
55
}
66

77
apply from: "$rootDir/scripts/build/utils.gradle"
@@ -66,7 +66,7 @@ dependencies {
6666
implementation 'androidx.preference:preference-ktx:1.2.0'
6767

6868
implementation "com.squareup.moshi:moshi:$moshiVersion"
69-
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
69+
ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
7070
}
7171

7272
task validateChanges {

sample/build.gradle

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
apply plugin: 'com.android.application'
2-
apply plugin: 'kotlin-android'
3-
apply plugin: 'kotlin-kapt'
1+
plugins {
2+
id 'com.android.application'
3+
id 'kotlin-android'
4+
id 'com.google.devtools.ksp' version '1.8.21-1.0.11'
5+
}
46

57
apply from: "$rootDir/scripts/build/utils.gradle"
68

@@ -110,13 +112,13 @@ dependencies {
110112
implementation 'com.squareup.okio:okio:2.10.0'
111113

112114
implementation "com.squareup.moshi:moshi:$moshiVersion"
113-
kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
115+
ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
114116

115117
implementation "androidx.datastore:datastore-preferences:1.0.0"
116118
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
117119

118120
implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion"
119121

120122
implementation "androidx.room:room-ktx:$roomsVersion"
121-
kapt "androidx.room:room-compiler:$roomsVersion"
123+
ksp "androidx.room:room-compiler:$roomsVersion"
122124
}

0 commit comments

Comments
 (0)