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

paulp/scct #43

Merged
merged 111 commits into from
Jan 24, 2014
Merged

paulp/scct #43

merged 111 commits into from
Jan 24, 2014

Conversation

0xRoch
Copy link
Member

@0xRoch 0xRoch commented Jan 24, 2014

No description provided.

Eero Kaukonen and others added 30 commits February 7, 2013 16:01
 example
	<configuration>
					<systemPropertyVariables>
						<scct.debug>false</scct.debug>
						<scct.project.name>${project.name}</scct.project.name>
						<scct.coverage.file>${project.build.outputDirectory}/coverage.data</scct.coverage.file>
						<scct.report.dir>${project.build.directory}/coverage-report</scct.report.dir>
						<scct.source.dir>${project.build.sourceDirectory}</scct.source.dir>
						<scct.excluded.paths.regex>src/main/scala/.*Excluded,other/excluded/path/regex</scct.excluded.paths.regex>
					</systemPropertyVariables>
				</configuration>
Conflicts:
	project/plugins.sbt
All Tests now passing - Fix for issue #4
Conflicts:
	project/build.properties
	src/test/scala/reaktor/scct/InstrumentationSpec.scala
0xRoch and others added 29 commits October 30, 2013 15:07
updating SCCT to Scala 2.10.3
Simplify settings for build.sbt in docs.
com.github.scct -> com.sqality.scct
Exclude by full class name (package + name) or by file path (relative to base dir).
adding the number of the statement and number of the covered statement t...
adding the number of the statement and number of the covered statement t...
Updated to the latest specs2 (2.3.7)
This merges in sqality/master, with this status:

[error] Failed: Total 142, Failed 8, Errors 0, Passed 134
[error] Failed tests:
[error]   com.sqality.scct.BasicClassInstrumentationSpec
[error]   com.sqality.scct.MiscInstrumentationSpec
[error]   com.sqality.scct.NameParsingInstrumentationSpec
[error]   com.sqality.scct.PlaceHolderInstrumentationSpec

I moved sbt settings specific to publishing into publishing.sbt.disabled,
and commented out all the plugins. It's using specs 2.3.6 instead
of 2.3.7 because there's no 2.3.7 released against 2.11.0-M7.

Conflicts:
	README.textile
	build.sbt
	project/build.properties
	project/plugins.sbt
	src/main/scala/com/sqality/scct/ScctInstrumentPlugin.scala
	src/test/scala/com/sqality/scct/DebugFlagsSpec.scala
	src/test/scala/com/sqality/scct/InstrumentationSpec.scala
	src/test/scala/com/sqality/scct/ScctInstrumentPluginSpec.scala
@0xRoch 0xRoch merged commit 4eedac7 into sqality:master Jan 24, 2014
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.

None yet

7 participants