8000 Merge pull request #462 from laserdisc-io/defaults · laserdisc-io/mysql-binlog-stream@9b12932 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9b12932

Browse files
barryoneillbarryoneill
authored
Merge pull request #462 from laserdisc-io/defaults
move to sbt defaults
2 parents 8372cc8 + 12b3bcc commit 9b12932

File tree

36 files changed

+186
-205
lines changed

36 files changed

+186
-205
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ jobs:
2424
~/.sbt
2525
key: sbt-${{ hashFiles('**/build.sbt') }}
2626
- name: Run tests
27-
run: sbt +clean +test +doc
27+
run: sbt build
2828

‎.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ jobs:
1111
with:
1212
fetch-depth: 0
1313
- uses: olafurpg/setup-scala@v14
14+
with:
15+
java-version: corretto@1.17
1416
- run: sbt ci-release
1517
env:
1618
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

‎.gitignore

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,42 @@
1+
# ------------------ autogenerated file - do not edit -------------------
2+
# This file was generated by sbt-laserdisc-defaults
3+
#
4+
# Please check in any changes generated in this file (for IDE support)
5+
#
6+
# To make changes, please publish a new version of the plugin at:
7+
# https://github.com/laserdisc-io/sbt-laserdisc-defaults
8+
#
9+
# To temporarily disable generation, set this at the top of build.sbt:
10+
# ThisBuild / laserdiscGitIgnoreGenOn := false
11+
# -----------------------------------------------------------------------
12+
13+
# tip: use a "global" gitignore (core.excludesfile) for your own, local, personal preferences
14+
# See: https://gist.github.com/subfuzion/db7f57fff2fb6998a16c
15+
16+
# scala / sbt / java
17+
project/project/
18+
project/target/
119
target/
20+
.sbtopts
21+
.tasty
22+
23+
# intellij
224
.idea/
25+
*.iml
26+
27+
# metals / bsp
28+
.metals/
29+
.bloop/
330
.bsp/
4-
.DS_Store
31+
project/metals.sbt
32+
33+
# vscode
34+
.vscode/
35+
36+
# terraform
37+
.terraform/
38+
*.tfplan
39+
*.terraform.lock.hcl
540

41+
# mac
42+
.DS_Store

‎.scalafmt.conf

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
1+
# ------------------ autogenerated file - do not edit -------------------
2+
# This file was generated by sbt-laserdisc-defaults
3+
#
4+
# Please check in any changes generated in this file (for IDE support)
5+
#
6+
# To make changes, please publish a new version of the plugin at:
7+
# https://github.com/laserdisc-io/sbt-laserdisc-defaults
8+
#
9+
# To temporarily disable generation, set this at the top of build.sbt:
10+
# ThisBuild / laserdiscScalaFmtGenOn := false
11+
# -----------------------------------------------------------------------
12+
113
version=3.8.3
214

315
maxColumn = 140
416
style = default
517
align.preset = more
618

7-
runner.dialect = scala213source3
19+
project.layout = StandardConvention
20+
runner.dialect = scala3
821
fileOverride {
9-
"glob:**/scala-3/**" { runner.dialect = scala3 }
22+
"lang:scala-2" = scala213source3
1023
}
1124

1225
danglingParentheses.preset = true

‎LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Dmytro Semenov & Barry O'Neill
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎binlog-stream-models/src/main/scala/io/laserdisc/mysql/binlog/models/BinaryLogs.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.laserdisc.mysql.binlog.models
22

3-
import cats.implicits.*
4-
import doobie.*
5-
import doobie.implicits.*
3+
import cats.implicits._
4+
import doobie._
5+
import doobie.implicits._
66
import cats.effect.MonadCancel
77

88
case class BinaryLogs(fileName: String, size: Long)

‎binlog-stream-models/src/main/scala/io/laserdisc/mysql/binlog/models/DeleteRowsEventData.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package io.laserdisc.mysql.binlog.models
22

3-
import com.github.shyiko.mysql.binlog.event.DeleteRowsEventData as JDeleteRowsEventData
3+
import com.github.shyiko.mysql.binlog.event.{DeleteRowsEventData => JDeleteRowsEventData}
44

5-
import scala.jdk.CollectionConverters.*
5+
import scala.jdk.CollectionConverters._
66
object DeleteRowsEventData {
77
def unapply(arg: JDeleteRowsEventData): Option[(Long, List[Array[Serializable]], Array[Int])] =
88
Some((arg.getTableId, arg.getRows.asScala.toList, arg.getIncludedColumns.stream().toArray))

‎binlog-stream-models/src/main/scala/io/laserdisc/mysql/binlog/models/EventHeaderV4.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.laserdisc.mysql.binlog.models
22

3-
import com.github.shyiko.mysql.binlog.event.{EventHeaderV4 as JEventHeaderV4, EventType}
3+
import com.github.shyiko.mysql.binlog.event.{EventHeaderV4 => JEventHeaderV4, EventType}
44

55
object EventHeaderV4 {
66
def unapply(arg: JEventHeaderV4): Option[(EventType, Long, Long)] =

‎binlog-stream-models/src/main/scala/io/laserdisc/mysql/binlog/models/QueryEventData.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.laserdisc.mysql.binlog.models
22

3-
import com.github.shyiko.mysql.binlog.event.QueryEventData as JQueryEventData
3+
import com.github.shyiko.mysql.binlog.event.{QueryEventData => JQueryEventData}
44

55
object QueryEventData {
66
def truncateTable(sql: String) = {

‎binlog-stream-models/src/main/scala/io/laserdisc/mysql/binlog/models/RotateEventData.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.laserdisc.mysql.binlog.models
22

3-
import com.github.shyiko.mysql.binlog.event.RotateEventData as JRotateEventData
3+
import com.github.shyiko.mysql.binlog.event.{RotateEventData => JRotateEventData}
44

55
object RotateEventData {
66
def unapply(arg: JRotateEventData): Option[(String, Long)] =

0 commit comments

Comments
 (0)
0