Skip to content

Commit 386a685

Browse files
authored
Merge pull request #4 from SethTisue/rebrand
1.1.0 is next, under a proudly waving Lightbend banner
2 parents 8c6024e + 253dbd4 commit 386a685

File tree

7 files changed

+37
-29
lines changed

7 files changed

+37
-29
lines changed

LICENSE

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
This software is licensed under the Apache 2 license, quoted below.
2-
3-
Copyright 2015 Typesafe Inc. [http://www.typesafe.com]
1+
Copyright 2015-2017 Lightbend Inc. [http://www.lightbend.com]
42

53
Licensed under the Apache License, Version 2.0 (the "License"); you may not
64
use this file except in compliance with the License. You may obtain a copy of
@@ -12,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
1210
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
1311
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
1412
License for the specific language governing permissions and limitations under
15-
the License.
13+
the License.

README.md

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
# Typesafe Emoji
1+
# Lightbend Emoji
22

3-
Typesafe Emoji is a wrapper around Java's Unicode Character handling.
3+
Lightbend Emoji is a wrapper around Java's Unicode Character handling.
44

55
## Examples
66

7-
For an example of Typesafe Emoji in an Enterprise Mission Critical Environment, please see [Typesafe Emojr](https://github.com/typesafehub/typesafe-emojr).
7+
For an example of Lightbend Emoji in an Enterprise Mission Critical Environment, please see [Typesafe Emojr](https://github.com/typesafehub/typesafe-emojr).
8+
9+
Note that Typesafe Emojr has not been Lightbend-rebranded or ported
10+
to Scala 2.12. To register your interest in an updated version, please
11+
contact Lightbend's enterprise sales team.
812

913
## Installation
1014

@@ -13,31 +17,31 @@ Add to build.sbt
1317
```
1418
resolvers += Resolver.typesafeIvyRepo("releases")
1519
16-
libraryDependencies += "com.typesafe" %% "emoji" % "1.0.0"
20+
libraryDependencies += "com.lightbend" %% "emoji" % "1.1.1"
1721
```
1822

1923
## Usage
2024

2125
```
2226
$ sbt console
23-
scala> import com.typesafe.emoji._
24-
scala> import com.typesafe.emoji.Emoji.Implicits._
27+
scala> import com.lightbend.emoji._
28+
scala> import com.lightbend.emoji.Emoji.Implicits._
2529
```
2630

2731
You can map Emoji directly from a Unicode character:
2832

2933
```
3034
scala> Emoji(0x1f603)
31-
res0: comp.typesafe.emoji.Emoji = 😃
35+
res0: com.lightbend.emoji.Emoji = 😃
3236
```
3337

3438
Or you can map the implicit from Int or String:
3539

3640
```
3741
scala> 0x1f603.emoji
38-
res1: comp.typesafe.emoji.Emoji = 😃
42+
res1: com.lightbend.emoji.Emoji = 😃
3943
scala> "0x1f603".codePointEmoji
40-
res2: com.typesafe.emoji.Emoji = 😃
44+
res2: com.lightbend.emoji.Emoji = 😃
4145
```
4246

4347
Once you have an emoji, you can ask it for codePoint (Int) or hexidecimal value:
@@ -54,10 +58,10 @@ Unicode codepoints are not very convenient, so there's a ShortCodes class which
5458
There is a default mapping available, which allows you to map from a string directly to an emoji:
5559

5660
```
57-
scala> import com.typesafe.emoji.ShortCodes.Implicits._
58-
scala> import com.typesafe.emoji.ShortCodes.Defaults._
61+
scala> import com.lightbend.emoji.ShortCodes.Implicits._
62+
scala> import com.lightbend.emoji.ShortCodes.Defaults._
5963
scala> "smiley".emoji
60-
res5: com.typesafe.emoji.Emoji = 😃
64+
res5: com.lightbend.emoji.Emoji = 😃
6165
```
6266

6367
You can query the current mapping for short codes:
@@ -71,10 +75,10 @@ Finally, you can also use your own short codes mapping:
7175

7276
```
7377
scala> implicit val mycodes = new ShortCodes()
74-
mycodes: com.typesafe.emoji.ShortCodes = com.typesafe.emoji.ShortCodes@49fd69f5
78+
mycodes: com.lightbend.emoji.ShortCodes = com.lightbend.emoji.ShortCodes@49fd69f5
7579
scala> mycodes.entry(Emoji(0x1f603), "yay")
7680
scala> "yay".emoji
77-
res1: com.typesafe.emoji.Emoji = 😃
81+
res1: com.lightbend.emoji.Emoji = 😃
7882
```
7983

8084
## Bugs

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import com.typesafe.sbt.SbtGit
22

33
name := "emoji"
44

5-
organization := "com.typesafe"
5+
organization := "com.lightbend"
66

77
version := "1.1.0"
88

@@ -31,9 +31,9 @@ libraryDependencies ++= Seq(
3131
)
3232

3333
initialCommands in console := {
34-
"""import com.typesafe.emoji._
35-
|import com.typesafe.emoji.Emoji.Implicits._
36-
|import com.typesafe.emoji.ShortCodes.Implicits._
34+
"""import com.lightbend.emoji._
35+
|import com.lightbend.emoji.Emoji.Implicits._
36+
|import com.lightbend.emoji.ShortCodes.Implicits._
3737
|""".stripMargin
3838
}
3939

src/main/scala/com/typesafe/emoji/Emoji.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* Copyright (C) 2015 Typesafe Inc. <http://www.typesafe.com>
2+
* Copyright (C) 2015-2017 Lightbend Inc. <http://www.lightbend.com>
33
*/
4-
package com.typesafe.emoji
4+
package com.lightbend.emoji
55

66
import scala.util.Try
77

@@ -151,4 +151,4 @@ object Emoji {
151151
codePoint.toHexString
152152
}
153153

154-
}
154+
}

src/main/scala/com/typesafe/emoji/ShortCodes.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
2-
* Copyright (C) 2015 Typesafe Inc. <http://www.typesafe.com>
2+
* Copyright (C) 2015-2017 Lightbend Inc. <http://www.lightbend.com>
33
*/
4-
package com.typesafe.emoji
4+
package com.lightbend.emoji
55

66
/**
77
* A emoji to shortcode mapping. This is a class that should be declared and used

src/test/scala/com/typesafe/emoji/EmojiSpec.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package com.typesafe.emoji
1+
/*
2+
* Copyright (C) 2015-2017 Lightbend Inc. <http://www.lightbend.com>
3+
*/
4+
package com.lightbend.emoji
25

36
import org.scalatest._
47
import org.scalatest.Matchers._

src/test/scala/com/typesafe/emoji/ShortCodesSpec.scala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
package com.typesafe.emoji
1+
/*
2+
* Copyright (C) 2015-2017 Lightbend Inc. <http://www.lightbend.com>
3+
*/
4+
package com.lightbend.emoji
25

36
import org.scalatest.Matchers._
47
import org.scalatest._

0 commit comments

Comments
 (0)