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

Feature/AOP-2213 #2

Merged
merged 7 commits into from
Apr 23, 2024
Merged
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
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: theon

---

Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: theon

---

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ jobs:

steps:
- name: Checkout Code
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
fetch-depth: 2

- name: Cache node modules
uses: actions/cache@v2
uses: actions/cache@v4
with:
key: scala-dependencies
path: |
Expand All @@ -44,13 +44,13 @@ jobs:
~/.coursier

- name: Set up JDK 21
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'adopt'

- name: Set up Node
uses: actions/setup-node@v2
uses: actions/setup-node@v4
with:
node-version: '14' # nodejs < 10 fails finding URL class

Expand Down
2 changes: 0 additions & 2 deletions CODEOWNERS

This file was deleted.

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# scala-uri

[![scala-uri CI](https://github.com/lemonlabsuk/scala-uri/actions/workflows/ci.yml/badge.svg)](https://github.com/lemonlabsuk/scala-uri/actions/workflows/ci.yml)
[![codecov.io](http://codecov.io/github/lemonlabsuk/scala-uri/coverage.svg?branch=master)](https://codecov.io/gh/lemonlabsuk/scala-uri/branch/master)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.lemonlabs/scala-uri_2.13/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.lemonlabs/scala-uri_2.12)
[![scala-uri CI](https://github.com/lemonlabsuk/scala-uri/actions/workflows/ci.yml/badge.svg)](https://github.com/ActianCorp/scala-uri/actions/workflows/ci.yml)
[![Scala.js](https://www.scala-js.org/assets/badges/scalajs-1.0.0.svg)](#scalajs-support)
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/lemonlabsuk/scala-uri.svg)](http://isitmaintained.com/project/lemonlabsuk/scala-uri "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/lemonlabsuk/scala-uri.svg)](http://isitmaintained.com/project/lemonlabsuk/scala-uri "Percentage of issues still open")
[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/ActianCorp/scala-uri.svg)](http://isitmaintained.com/project/ActianCorp/scala-uri "Average time to resolve an issue")
[![Percentage of issues still open](http://isitmaintained.com/badge/open/ActianCorp/scala-uri.svg)](http://isitmaintained.com/project/ActianCorp/scala-uri "Percentage of issues still open")

`scala-uri` is a small Scala library that helps you work with URIs. It has the following features:

Expand Down
41 changes: 12 additions & 29 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ import com.typesafe.tools.mima.core.{
}
import com.typesafe.tools.mima.plugin.MimaKeys.{mimaBinaryIssueFilters, mimaPreviousArtifacts, mimaReportBinaryIssues}

lazy val NEXUS_HOST = sys.props.get("NEXUS_HOST").getOrElse("")
lazy val NEXUS_USER = sys.props.get("NEXUS_USER").getOrElse("")
lazy val NEXUS_PASS = sys.props.get("NEXUS_PASS").getOrElse("")

name := "scala-uri root"

ThisBuild / scalaVersion := "3.3.3"
Expand All @@ -25,12 +29,12 @@ val isScala3 = Def.setting {
}

val sharedSettings = Seq(
organization := "io.lemonlabs",
organization := "com.actian",
libraryDependencies ++= Seq(
"org.typelevel" %%% "simulacrum-scalafix-annotations" % simulacrumScalafixVersion,
"org.scalatest" %%% "scalatest" % "3.2.18" % Test,
"org.scalatestplus" %%% "scalacheck-1-17" % "3.2.18.0" % Test,
"org.scalacheck" %%% "scalacheck" % "1.17.0" % Test,
"org.scalacheck" %%% "scalacheck" % "1.18.0" % Test,
"org.typelevel" %%% "cats-laws" % "2.10.0" % Test
),
scalacOptions ++= Seq(
Expand Down Expand Up @@ -67,7 +71,7 @@ val scalaUriSettings = Seq(
description := "Simple scala library for building and parsing URIs",
libraryDependencies ++= Seq(
"org.typelevel" %%% "cats-core" % "2.10.0",
"org.typelevel" %%% "cats-parse" % "0.3.10"
"org.typelevel" %%% "cats-parse" % "1.0.0"
),
libraryDependencies ++= (if (isScala3.value) Nil else Seq("com.chuusai" %%% "shapeless" % "2.3.10")),
pomPostProcess := { node =>
Expand All @@ -87,35 +91,14 @@ val publishingSettings = Seq(
pomIncludeRepository := { _ =>
false
},
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
resolvers += "Sonatype OSS Releases" at "https://oss.sonatype.org/content/repositories/releases",
credentials += Credentials("Sonatype Nexus Repository Manager", NEXUS_HOST, NEXUS_USER, NEXUS_PASS),
publishTo := {
val nexus = "https://oss.sonatype.org/"
val nexus = "https://alm.actian.com/nexus/"
if (version.value.trim.endsWith("SNAPSHOT"))
Some("snapshots" at nexus + "content/repositories/snapshots")
Some("snapshots" at nexus + "content/repositories/aop-snapshot")
else
Some("releases" at nexus + "service/local/staging/deploy/maven2")
},
pomExtra :=
<url>https://github.com/lemonlabsuk/scala-uri</url>
<licenses>
<license>
<name>Apache 2</name>
<url>http://www.apache.org/licenses/LICENSE-2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>[email protected]:lemonlabsuk/scala-uri.git</url>
<connection>scm:[email protected]:lemonlabsuk/scala-uri.git</connection>
</scm>
<developers>
<developer>
<id>theon</id>
<name>Ian Forsey</name>
<url>https://lemonlabs.io</url>
</developer>
</developers>
Some("releases" at nexus + "content/repositories/aop")
}
)

val previousVersions = Set.empty[String] // Set(0, 4).map(v => s"3.$v.0")
Expand Down
4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.11")

addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.15.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.16.0")

addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")

Expand All @@ -13,3 +13,5 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")

addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.0")

addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")