-
-
Notifications
You must be signed in to change notification settings - Fork 290
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Kotlin module #147
Kotlin module #147
Conversation
Some small fixes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All good 👍
build.gradle
Outdated
@@ -12,6 +12,7 @@ codeQualityTools { | |||
} | |||
|
|||
buildscript { | |||
ext.kotlin_version = '1.1.2-5' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
1.1.3
emoji-kotlin/build.gradle
Outdated
} | ||
|
||
apply from: rootProject.file('gradle/gradle-mvn-push.gradle') | ||
repositories { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should not be needed.
emoji-kotlin/proguard-rules.pro
Outdated
# You can edit the include path and order by changing the proguardFiles | ||
# directive in build.gradle. | ||
# | ||
# For more details, see |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's remove all of this.
Not sure what's wrong with Travis:
|
Fix issue
Trying to exclude Kotlin classes from generated javadoc
Codecov Report
@@ Coverage Diff @@
## master #147 +/- ##
=======================================
Coverage 27.93% 27.93%
=======================================
Files 22 22
Lines 809 809
Branches 89 89
=======================================
Hits 226 226
Misses 565 565
Partials 18 18 Continue to review full report at Codecov.
|
emoji-kotlin/build.gradle
Outdated
resourcePrefix 'emoji' | ||
|
||
sourceSets { | ||
main.java.srcDirs += 'src/main/kotlin' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you just do everything in src/main/java
?
@@ -85,6 +85,7 @@ afterEvaluate { project -> | |||
task androidJavadocs(type: Javadoc) { | |||
source = android.sourceSets.main.java.srcDirs | |||
classpath += project.files(android.getBootClasspath().join(File.pathSeparator)) | |||
excludes = ['**/*.kt'] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so this fixed the issue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, basically ignoring Kotlin files for javadoc generation.
Added extra extensions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The import is missing. CI fails with /home/travis/build/vanniktech/Emoji/emoji-kotlin/src/main/java/com/vanniktech/emoji/kotlin/EmojiExtensions.kt: (9, 33): Unresolved reference: EmojiUtils
Added Kotlin module containing 2 extensions functions over String.
TODO: Modify the readme accordingly.