Skip to content

Commit

Permalink
bump version 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
sergei-lapin committed Mar 30, 2021
1 parent ffe6c57 commit f7cee3b
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 116 deletions.
12 changes: 12 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions buildscript/dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ ext.deps = [
constraintLayout: "androidx.constraintlayout:constraintlayout:2.0.4"
],
google : [
material: "com.google.android.material:material:1.3.0",
dagger: "com.google.dagger:dagger:2.33",
material : "com.google.android.material:material:1.3.0",
dagger : "com.google.dagger:dagger:2.33",
daggerCompiler: "com.google.dagger:dagger-compiler:2.33"
],
napt: [
napt : [
javac: "com.github.sergei-lapin:napt:1.3"
]
]
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ android.defaults.buildfeatures.shaders=false
kotlin.code.style=official

lib.group=com.sergei-lapin.napt
lib.version=1.3
lib.version=1.4
2 changes: 1 addition & 1 deletion jitpack.yml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
jdk:
- openjdk11
- openjdk9
2 changes: 1 addition & 1 deletion napt-gradle/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
lib.group=com.sergei-lapin.napt
lib.version=1.3
lib.version=1.4

This file was deleted.

30 changes: 0 additions & 30 deletions napt-gradle/src/main/java/com/slapin/napt/NaptGradlePlugin.kt
Original file line number Diff line number Diff line change
@@ -1,46 +1,16 @@
package com.slapin.napt

import com.slapin.napt.task.CleanNaptTrigger
import com.slapin.napt.task.CreateNaptTrigger
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.Delete
import org.gradle.api.tasks.compile.JavaCompile
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

class NaptGradlePlugin : Plugin<Project> {

override fun apply(target: Project) {
val extension = target.extensions.create("napt", NaptGradleExtension::class.java)
val createTrigger = target.tasks.register(
"createNaptTrigger",
CreateNaptTrigger::class.java,
target,
extension.naptTriggerPackagePrefix
)
createTrigger.configure { task ->
task.group = "napt"
task.description = "Creates NaptTrigger.java in order to trigger NAPT javac plugin"
}
target.tasks.withType(KotlinCompile::class.java).configureEach { kotlinCompile ->
kotlinCompile.dependsOn(createTrigger)
}
target.tasks.withType(JavaCompile::class.java).configureEach { javaCompile ->
javaCompile.doFirst {
javaCompile.options.compilerArgs.add("-Xplugin:Napt")
}
}
val cleanTrigger = target.tasks.register(
"cleanNaptTrigger",
CleanNaptTrigger::class.java,
target
)
cleanTrigger.configure { task ->
task.group = "napt"
task.description = "Removes NaptTrigger.java if present"
}
target.tasks.withType(Delete::class.java).configureEach { delete ->
delete.dependsOn(cleanTrigger)
}
}
}
11 changes: 0 additions & 11 deletions napt-gradle/src/main/java/com/slapin/napt/ext/ProjectExt.kt

This file was deleted.

20 changes: 0 additions & 20 deletions napt-gradle/src/main/java/com/slapin/napt/task/CleanNaptTrigger.kt

This file was deleted.

This file was deleted.

6 changes: 1 addition & 5 deletions sample/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
plugins {
id("com.android.application")
id("kotlin-android")
id("com.sergei-lapin.napt") version("1.3")
}

napt {
naptTriggerPackagePrefix.set("com.slapin.napt")
id("com.sergei-lapin.napt") version("1.4")
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.slapin.napt.sample

import android.annotation.SuppressLint
import android.app.Activity
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle
import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import dagger.BindsInstance
import dagger.Component

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ rootProject.name = "napt"
include(":sample")
include(":napt-javac")

// includeBuild("napt-gradle")
includeBuild("napt-gradle")

0 comments on commit f7cee3b

Please sign in to comment.