diff --git a/build.gradle b/build.gradle index 752a002c6..232829b91 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,6 @@ buildscript { repositories { maven { url "https://plugins.gradle.org/m2/" } google() - jcenter() mavenCentral() } dependencies { @@ -17,10 +16,10 @@ buildscript { // maven central dependencies classpath 'io.github.gradle-nexus:publish-plugin:1.1.0' - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.4.30' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.5.0' // ktlint & detekt dependencies - classpath "org.jlleitschuh.gradle:ktlint-gradle:10.2.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:11.1.0" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:$detektVersion" } } @@ -28,7 +27,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() // for testing Pluto staged repository maven { url "https://s01.oss.sonatype.org/content/groups/staging/" } diff --git a/dependencies.gradle b/dependencies.gradle index 517156694..1fac6404e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ ext { compileSdkVersion = 33 buildToolsVersion = '32.0.0' - kotlinVersion = '1.7.20' + kotlinVersion = '1.8.21' detektVersion = '1.19.0' androidXCoreVersion = '1.6.0' @@ -12,7 +12,7 @@ ext { roomsVersion = '2.5.1' moshiVersion = '1.13.0' navigationVersion = '2.4.1' - composeCompileVersion = '1.3.2' - composeVersion = '1.3.1' + composeCompileVersion = '1.4.7' + composeVersion = '1.4.0' composeMaterial3Version = '1.0.1' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6c7f5b4bd..4cedc4d03 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Feb 08 21:06:21 IST 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/pluto-plugins/plugins/exceptions/lib/build.gradle b/pluto-plugins/plugins/exceptions/lib/build.gradle index 97ed2223d..88c5ada64 100644 --- a/pluto-plugins/plugins/exceptions/lib/build.gradle +++ b/pluto-plugins/plugins/exceptions/lib/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'kotlin-parcelize' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' } apply from: "$rootDir/scripts/build/utils.gradle" @@ -65,8 +65,8 @@ dependencies { implementation "androidx.core:core-ktx:$androidXCoreVersion" implementation "com.squareup.moshi:moshi:$moshiVersion" - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" implementation "androidx.room:room-ktx:$roomsVersion" - kapt "androidx.room:room-compiler:$roomsVersion" + ksp "androidx.room:room-compiler:$roomsVersion" } \ No newline at end of file diff --git a/pluto-plugins/plugins/layout-inspector/lib/build.gradle b/pluto-plugins/plugins/layout-inspector/lib/build.gradle index 4e3dd8ba5..b6dace8b0 100644 --- a/pluto-plugins/plugins/layout-inspector/lib/build.gradle +++ b/pluto-plugins/plugins/layout-inspector/lib/build.gradle @@ -2,7 +2,6 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'kotlin-parcelize' - id 'kotlin-kapt' } apply from: "$rootDir/scripts/build/utils.gradle" diff --git a/pluto-plugins/plugins/logger/lib/build.gradle b/pluto-plugins/plugins/logger/lib/build.gradle index ade585c85..178db130d 100644 --- a/pluto-plugins/plugins/logger/lib/build.gradle +++ b/pluto-plugins/plugins/logger/lib/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'kotlin-parcelize' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' } apply from: "$rootDir/scripts/build/utils.gradle" @@ -63,10 +63,10 @@ dependencies { implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' api 'com.jakewharton.timber:timber:5.0.1' implementation "com.squareup.moshi:moshi:$moshiVersion" - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" implementation "androidx.room:room-ktx:$roomsVersion" - kapt "androidx.room:room-compiler:$roomsVersion" + ksp "androidx.room:room-compiler:$roomsVersion" } task validateChanges { diff --git a/pluto-plugins/plugins/network/lib/build.gradle b/pluto-plugins/plugins/network/lib/build.gradle index 66f53308b..8eb5f8de1 100644 --- a/pluto-plugins/plugins/network/lib/build.gradle +++ b/pluto-plugins/plugins/network/lib/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'kotlin-parcelize' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' } apply from: "$rootDir/scripts/build/utils.gradle" @@ -67,10 +67,10 @@ dependencies { implementation "androidx.room:room-ktx:$roomsVersion" implementation 'androidx.legacy:legacy-support-v4:1.0.0' - kapt "androidx.room:room-compiler:$roomsVersion" + ksp "androidx.room:room-compiler:$roomsVersion" implementation "com.squareup.moshi:moshi:$moshiVersion" - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" implementation 'androidx.browser:browser:1.4.0' testImplementation 'junit:junit:4.13.2' diff --git a/pluto-plugins/plugins/rooms-database/lib/build.gradle b/pluto-plugins/plugins/rooms-database/lib/build.gradle index 426208579..b765cef90 100644 --- a/pluto-plugins/plugins/rooms-database/lib/build.gradle +++ b/pluto-plugins/plugins/rooms-database/lib/build.gradle @@ -2,7 +2,7 @@ plugins { id 'com.android.library' id 'kotlin-android' id 'kotlin-parcelize' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' } apply from: "$rootDir/scripts/build/utils.gradle" @@ -66,5 +66,5 @@ dependencies { implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation "androidx.room:room-ktx:$roomsVersion" - kapt "androidx.room:room-compiler:$roomsVersion" + ksp "androidx.room:room-compiler:$roomsVersion" } \ No newline at end of file diff --git a/pluto-plugins/plugins/shared-preferences/lib/build.gradle b/pluto-plugins/plugins/shared-preferences/lib/build.gradle index e7d2ab974..dbdafd4b7 100644 --- a/pluto-plugins/plugins/shared-preferences/lib/build.gradle +++ b/pluto-plugins/plugins/shared-preferences/lib/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.library' id 'kotlin-android' - id 'kotlin-kapt' + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' } apply from: "$rootDir/scripts/build/utils.gradle" @@ -66,7 +66,7 @@ dependencies { implementation 'androidx.preference:preference-ktx:1.2.0' implementation "com.squareup.moshi:moshi:$moshiVersion" - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" } task validateChanges { diff --git a/pluto/lib-no-op/src/main/java/com/pluto/Pluto.kt b/pluto/lib-no-op/src/main/java/com/pluto/Pluto.kt index cabb3594a..700f84c9b 100644 --- a/pluto/lib-no-op/src/main/java/com/pluto/Pluto.kt +++ b/pluto/lib-no-op/src/main/java/com/pluto/Pluto.kt @@ -13,9 +13,8 @@ object Pluto { fun showNotch(state: Boolean) { } - fun clearAllLogs() {} - - fun clearLogs(plugin: Any) {} + @JvmOverloads + fun clearLogs(identifier: String? = null) {} class Installer(private val application: Application) { @@ -25,6 +24,10 @@ object Pluto { return this } + fun addPluginGroup(pluginGroup: Any): Installer { + return this + } + fun install() { } } diff --git a/sample/build.gradle b/sample/build.gradle index 3b6a3c213..6ba7d60dd 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,6 +1,8 @@ -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-kapt' +plugins { + id 'com.android.application' + id 'kotlin-android' + id 'com.google.devtools.ksp' version '1.8.21-1.0.11' +} apply from: "$rootDir/scripts/build/utils.gradle" @@ -110,7 +112,7 @@ dependencies { implementation 'com.squareup.okio:okio:2.10.0' implementation "com.squareup.moshi:moshi:$moshiVersion" - kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" + ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion" implementation "androidx.datastore:datastore-preferences:1.0.0" debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7' @@ -118,5 +120,5 @@ dependencies { implementation "androidx.navigation:navigation-fragment-ktx:$navigationVersion" implementation "androidx.room:room-ktx:$roomsVersion" - kapt "androidx.room:room-compiler:$roomsVersion" + ksp "androidx.room:room-compiler:$roomsVersion" }