Skip to content
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

Merged
merged 25 commits into from
Sep 12, 2017
Merged

Kotlin module #147

merged 25 commits into from
Sep 12, 2017

Conversation

aballano
Copy link
Contributor

Added Kotlin module containing 2 extensions functions over String.

TODO: Modify the readme accordingly.

Copy link
Owner

@vanniktech vanniktech left a 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'
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.1.3

}

apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
repositories {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should not be needed.

# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
Copy link
Owner

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.

@vanniktech vanniktech added this to the 0.5.0 milestone Jun 28, 2017
@vanniktech vanniktech modified the milestones: 0.6.0, 0.5.0 Jul 2, 2017
@aballano
Copy link
Contributor Author

aballano commented Jul 5, 2017

Not sure what's wrong with Travis:

What went wrong:
Execution failed for task ':app:transformClassesWithDexForDebug'.
com.android.build.api.transform.TransformException: java.lang.RuntimeException: java.lang.RuntimeException: Unable to pre-dex '/home/travis/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-compiler-embeddable/1.1.3-2/20bbabe4719a89eb83eca78dd74c606274f7f320/kotlin-compiler-embeddable-1.1.3-2.jar' to '/home/travis/build/vanniktech/Emoji/app/build/intermediates/pre-dexed/debug/kotlin-compiler-embeddable-1.1.3-2_649ebbb6eca4c520f60a62dd593f1f0c7787bb95.jar'

@codecov
Copy link

codecov bot commented Sep 11, 2017

Codecov Report

Merging #147 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           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.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f3f7663...1eca344. Read the comment docs.

resourcePrefix 'emoji'

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Copy link
Owner

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']
Copy link
Owner

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?

Copy link
Contributor Author

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.
Copy link
Owner

@vanniktech vanniktech left a 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

@vanniktech vanniktech merged commit 9cb56cb into vanniktech:master Sep 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants