Skip to content

Commit

Permalink
Annotation processors in Kotlin (#775)
Browse files Browse the repository at this point in the history
* Common annotation processor in Kotlin

* Common annotation processor tests in Kotlin

* SQLite annotation processor  in Kotlin

* java.lang -> javaTypeObject fixes

* Reformat

* Fix content resolver processor tests

* Content resolver processor in Kotlin

* Fix test case

* Add dummy java processors

* Improve some formatting

* Eliminate it overuse

* Fix PR comments

* More PR fixes

* Use trimIndent for code blocks formatting
  • Loading branch information
geralt-encore authored Apr 3, 2017
1 parent 8575ad9 commit da7a1f5
Show file tree
Hide file tree
Showing 215 changed files with 2,569 additions and 3,298 deletions.
6 changes: 6 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import org.gradle.internal.jvm.Jvm
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
ext.kotlin_version = '1.1.1'
repositories {
jcenter()
}
Expand All @@ -16,6 +17,9 @@ buildscript {
// https://github.com/palantir/gradle-jacoco-coverage
classpath 'com.palantir:jacoco-coverage:0.2.0'

// Kotlin
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand Down Expand Up @@ -50,6 +54,7 @@ ext.libraries = [
// Core libraries
supportAnnotations : 'com.android.support:support-annotations:' + supportLibsVersion,
rxJava : 'io.reactivex:rxjava:1.2.1',
kotlinStdLib : "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version",

// Parts of StorIO
storIOCommon : project(':storio-common'),
Expand All @@ -67,6 +72,7 @@ ext.libraries = [
assertJ : 'org.assertj:assertj-core:3.6.2',
assertJAndroid : 'com.squareup.assertj:assertj-android:1.1.1',
mockitoCore : 'org.mockito:mockito-core:2.7.19',
mockitoKotlin : 'com.nhaarman:mockito-kotlin:1.4.0',

equalsVerifier : 'nl.jqno.equalsverifier:equalsverifier:1.7.2',
privateConstructorChecker : 'com.pushtorefresh.java-private-constructor-checker:checker:1.1.0',
Expand Down
16 changes: 10 additions & 6 deletions storio-common-annotations-processor/build.gradle
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
apply plugin: 'java'

targetCompatibility = '1.6'
sourceCompatibility = '1.6'
apply plugin: 'kotlin'

dependencies {
compile libraries.intellijAnnotations
compile libraries.autoService
compile libraries.javaPoet
compile libraries.kotlinStdLib

testCompile libraries.junit
testCompile libraries.assertJ
testCompile libraries.mockitoCore
testCompile libraries.mockitoKotlin
testCompile libraries.equalsVerifier
}


sourceSets {
main.java.srcDirs += 'src/main/kotlin'
test.java.srcDir 'src/test/kotlin'
}

apply from: '../gradle/publish-java-lib.gradle'
apply from: '../gradle/jacoco-non-android.gradle'
apply from: '../gradle/jacoco-non-android.gradle'

This file was deleted.

This file was deleted.

Loading

0 comments on commit da7a1f5

Please sign in to comment.