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

WIP Cross-build on Scala3 #178

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 34 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,34 @@
target/
target/

# macOS
.DS_Store

# sbt specific
dist/*
target/
lib_managed/
src_managed/
project/boot/
project/plugins/project/
project/local-plugins.sbt
.history
.ensime
.ensime_cache/
.sbt-scripted/
local.sbt

# Bloop
.bsp

# VS Code
.vscode/

# Metals
.bloop/
.metals/
metals.sbt

# IDEA
.idea
.idea_modules
/.worksheet/
7 changes: 6 additions & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
version = "3.6.1"
runner.dialect = scala3
style = defaultWithAlign
maxColumn = 100

docstrings = JavaDoc
docstrings.style = Asterisk
docstrings.wrap = no

optIn.breakChainOnFirstMethodDot = true
spaces.afterKeywordBeforeParen = true
continuationIndent.defnSite = 2
Expand All @@ -28,3 +32,4 @@ rewrite {
]
redundantBraces.maxLines = 1
}

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ can also configure an LRU (Least Recently Used) cache of variable size

## Installation

The latest version of scala-maxmind-iplookups is **0.8.1** and is compatible with Scala 2.13.
The latest version of scala-maxmind-iplookups is **0.8.1** and is compatible with Scala 3.2, 2.13, and 2.12.

Add this to your SBT config:

Expand Down
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ lazy val root = project
organization := "com.snowplowanalytics",
name := "scala-maxmind-iplookups",
description := "Scala wrapper for MaxMind GeoIP2 library",
scalaVersion := "2.13.8",
crossScalaVersions := Seq("2.13.8", "2.12.15"),
scalaVersion := "3.2.2",
crossScalaVersions := Seq("3.2.2", "2.13.10", "2.12.17"),
javacOptions := BuildSettings.javaCompilerOptions,
scalafmtOnCompile := true
)
Expand Down