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.

Sign up for GitHub

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

Jump to bottom

Annotation fixes #236

Merged
merged 4 commits into from
May 13, 2017
Merged

Annotation fixes #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b550ea
set @since correctly - these changes will be in 1.3
derekmorr May 13, 2017
1d66b6e
set @deprecated correctly - these values will be deprecated in 1.3
derekmorr May 13, 2017
803a562
Merge branch 'master' into annotation-fixes
derekmorr May 13, 2017
6526927
Merge branch 'master' into annotation-fixes
derekmorr May 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/src/main/scala/squants/mass/MomentOfIntertia.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import squants.{AbstractQuantityNumeric, Dimension, Length, PrimaryUnit, Quantit
/**
*
* @author paxelord
* @since 1.2
* @since 1.3
*
* @param value Double
*/
Expand Down
2 changes: 1 addition & 1 deletion shared/src/main/scala/squants/motion/AngularAcceleration.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import squants.{AbstractQuantityNumeric, Dimension, Length, PrimaryUnit, Quantit
/**
*
* @author paxelord
* @since 1.2
* @since 1.3
*
* @param value Double
*/
Expand Down
6 changes: 3 additions & 3 deletions shared/src/main/scala/squants/motion/AngularVelocity.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ final class AngularVelocity private (val value: Double, val unit: AngularVelocit

def toRadiansPerSecond = to(RadiansPerSecond)
def toDegreesPerSecond = to(DegreesPerSecond)
@deprecated(message = "Potentially confusing naming. Use toGradiansPerSecond instead.", since = "Squants 1.2")
@deprecated(message = "Potentially confusing naming. Use toGradiansPerSecond instead.", since = "Squants 1.3")
def toGradsPerSecond = to(GradiansPerSecond)
def toGradiansPerSecond = to(GradiansPerSecond)
def toTurnsPerSecond = to(TurnsPerSecond)
Expand Down Expand Up @@ -72,7 +72,7 @@ object GradiansPerSecond extends AngularVelocityUnit {
val conversionFactor = Gradians.conversionFactor * Radians.conversionFactor
}

@deprecated(message = "Potentially confusing naming. Use GradiansPerSecond instead.", since = "Squants 1.2")
@deprecated(message = "Potentially confusing naming. Use GradiansPerSecond instead.", since = "Squants 1.3")
object GradsPerSecond extends AngularVelocityUnit {
val symbol = "grad/s"
val conversionFactor = Gradians.conversionFactor * Radians.conversionFactor
Expand All @@ -93,7 +93,7 @@ object AngularVelocityConversions {
implicit class AngularVelocityConversions[A](n: A)(implicit num: Numeric[A]) {
def radiansPerSecond = RadiansPerSecond(n)
def degreesPerSecond = DegreesPerSecond(n)
@deprecated(message = "Potentially confusing naming. Use gradiansPerSecond instead.", since = "Squants 1.2")
@deprecated(message = "Potentially confusing naming. Use gradiansPerSecond instead.", since = "Squants 1.3")
def gradsPerSecond = GradiansPerSecond(n)
def gradiansPerSecond = GradiansPerSecond(n)
def turnsPerSecond = TurnsPerSecond(n)
Expand Down
2 changes: 1 addition & 1 deletion shared/src/main/scala/squants/motion/Torque.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import squants.{AbstractQuantityNumeric, Dimension, Energy, PrimaryUnit, Quantit
/**
*
* @author paxelord
* @since 1.2
* @since 1.3
*
* @param value Double
*/
Expand Down
2 changes: 1 addition & 1 deletion shared/src/test/scala/squants/mass/MomentOfInertiaSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import squants.space.{Feet, Meters}
/**
*
* @author paxelord
* @since 1.2
* @since 1.3
**/
class MomentOfInertiaSpec extends FlatSpec with Matchers with CustomMatchers {

Expand Down
2 changes: 1 addition & 1 deletion shared/src/test/scala/squants/motion/AngularAccelerationSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import squants.time.Seconds
/**
*
* @author paxelord
* @since 1.2
* @since 1.3
*/
class AngularAccelerationSpec extends FlatSpec with Matchers{

Expand Down