erik/kobalt-line-count
erik/kobalt-line-count
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt-line-count.git synced 2025-04-25 03:07:11 -07:00
Code Releases Activity

Merge branch 'master' of github.com:cbeust/kobalt-line-count

Browse source 
Conflicts:
	kobalt/Build.kt.iml
	kobalt/wrapper/kobalt-wrapper.properties
This commit is contained in:
Cedric Beust 2016-02-16 17:15:47 -08:00
commit 78b0b73374
4 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
kobalt-line-count.iml
View file

@ -5,17 +5,12 @@
<output-test url="file://$MODULE_DIR$/build/classes/test" /> <output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/kotlin" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/kotlin" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
<excludeFolder url="file://$MODULE_DIR$/build" />
</content> </content>
<orderEntry type="inheritedJdk" /> <orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kobalt-line-count (Compile)" level="project" /> <orderEntry type="library" name="kobalt-line-count (Compile)" level="project" />
<orderEntry type="library" scope="TEST" name="kobalt-line-count (Test)" level="project" />
</component> </component>
</module> </module>

2
kobalt/Build.kt.iml
View file

@ -2,8 +2,6 @@
<module type="JAVA_MODULE" version="4"> <module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$" />
<content url="file://D:/Java/jdk1.8.0_05" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="kobalt.jar" level="project" /> <orderEntry type="library" name="kobalt.jar" level="project" />
</component> </component>

2
kobalt/src/Build.kt
View file

@ -17,7 +17,7 @@ val project = project {
name = "kobalt-line-count" name = "kobalt-line-count"
group = "com.beust.kobalt" group = "com.beust.kobalt"
artifactId = name artifactId = name
version = "0.17" version = "0.18"
dependencies { dependencies {
compile("com.beust:kobalt-plugin-api:") compile("com.beust:kobalt-plugin-api:")

6
kobalt/wrapper/kobalt-wrapper.properties
View file

@ -1 +1,5 @@
kobalt.version=0.605 <<<<<<< HEAD
kobalt.version=0.605
=======
kobalt.version=0.390
>>>>>>> 6863392c7dbb354504b955000ced270f22d307be