Skip to content

Commit

Permalink
make actions happy
Browse files Browse the repository at this point in the history
  • Loading branch information
ValdemarGr committed Oct 6, 2023
1 parent fb54c46 commit a8cb889
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,11 @@ jobs:

- name: Make target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: mkdir -p generator/target parser/target proto/target generator-cli/target client/target target project/target
run: mkdir -p generator/target generator-core/target parser/target proto/target generator-cli/target encoder/target client/target target testkit/target project/target

- name: Compress target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
run: tar cf targets.tar generator/target parser/target proto/target generator-cli/target client/target target project/target
run: tar cf targets.tar generator/target generator-core/target parser/target proto/target generator-cli/target encoder/target client/target target testkit/target project/target

- name: Upload target directories
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = "3.0.5"
runner.dialect = scala213
runner.dialect = scala213source3
maxColumn = 140
fileOverride {
"glob:**/modules/http4s/src/test/scala/**" {
Expand Down
16 changes: 16 additions & 0 deletions encoder/src/main/scala/spice4s/encoder/Spice4sEncoder.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2023 CaseHubDK
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package spice4s.encoder

import spice4s.client.models._
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2023 CaseHubDK
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package spice4s.generator.core

import spice4s.client.models._
Expand Down Expand Up @@ -70,8 +86,7 @@ trait Spice4sAnyRelation[Res <: Spice4sResource, Rel <: Spice4sRelationType] {
def subjects: NonEmptyList[Spice4sCompanion[? <: Spice4sResource]]
}

trait Spice4sRelation[Res <: Spice4sResource, Rel <: Spice4sRelationType, Sub <: Spice4sResource]
extends Spice4sAnyRelation[Res, Rel] {
trait Spice4sRelation[Res <: Spice4sResource, Rel <: Spice4sRelationType, Sub <: Spice4sResource] extends Spice4sAnyRelation[Res, Rel] {
def subResource: Spice4sCompanion[Sub]
def subjects = NonEmptyList.one(subResource)
def apply(res: Res, sub: Sub): RelationshipRequest[Res, Rel, Sub] =
Expand All @@ -87,4 +102,3 @@ trait Spice4sUnionRelation[
def apply[A <: Spice4sResource](res: Res, sub: A)(implicit @unused ev: Sub[A]): RelationshipRequest[Res, Rel, A] =
RelationshipRequest(res, relation, sub, subjectRelation)
}

1 change: 0 additions & 1 deletion project/metals.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
// This file enables sbt-bloop to create bloop config files.

addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "1.5.6")

16 changes: 16 additions & 0 deletions testkit/src/main/scala/spice4s/testkit/StubClient.scala
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
* Copyright 2023 CaseHubDK
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package spice4s.testkit

import cats.implicits._
Expand Down

0 comments on commit a8cb889

Please sign in to comment.