Skip to content

Commit 026041c

Browse files
authored
chore(release)!: Move to io.funktional org (#218)
BREAKING CHANGE: users will need to modify their dependencies to io.funktional
1 parent c4af955 commit 026041c

File tree

11 files changed

+33
-32
lines changed

11 files changed

+33
-32
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,15 +73,15 @@ jobs:
7373
run: sbt '++ ${{ matrix.scala }}' doc
7474

7575
- name: Make target directories
76-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
76+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
7777
run: mkdir -p modules/redis-rediculous/target modules/core-tests/target modules/redis-rediculous-tests/target modules/db-migration/target modules/example/target modules/flags/target modules/http-client/target modules/rabbitmq-fs2-tests/target modules/db-skunk-tests/target modules/rabbitmq-fs2/target modules/db-skunk/target modules/db-migration-tests/target modules/http-client-tests/target modules/db-doobie/target modules/docs/target modules/db-doobie-tests/target modules/core/target project/target
7878

7979
- name: Compress target directories
80-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
80+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
8181
run: tar cf targets.tar modules/redis-rediculous/target modules/core-tests/target modules/redis-rediculous-tests/target modules/db-migration/target modules/example/target modules/flags/target modules/http-client/target modules/rabbitmq-fs2-tests/target modules/db-skunk-tests/target modules/rabbitmq-fs2/target modules/db-skunk/target modules/db-migration-tests/target modules/http-client-tests/target modules/db-doobie/target modules/docs/target modules/db-doobie-tests/target modules/core/target project/target
8282

8383
- name: Upload target directories
84-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
84+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
8585
uses: actions/upload-artifact@v4
8686
with:
8787
name: target-${{ matrix.os }}-${{ matrix.java }}-${{ matrix.scala }}
@@ -90,7 +90,7 @@ jobs:
9090
publish:
9191
name: Publish Artifacts
9292
needs: [prepare-release]
93-
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
93+
if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
9494
strategy:
9595
matrix:
9696
os: [ubuntu-latest]

README.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ To use the latest version, include the following in your `build.sbt`:
2727
[source,scala]
2828
--
2929
libraryDependencies ++= Seq(
30-
"com.rlemaitre" %% "pillars" % "@VERSION@"
30+
"io.funktional" %% "pillars" % "@VERSION@"
3131
)
3232
--
3333

build.sbt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import xerial.sbt.Sonatype.GitHubHosting
2+
import xerial.sbt.Sonatype.sonatypeCentralHost
23

34
ThisBuild / tlBaseVersion := "0.4" // your current series x.y
45

5-
ThisBuild / organization := "com.rlemaitre"
6+
ThisBuild / organization := "io.funktional"
67
ThisBuild / homepage := Some(url("https://pillars.dev"))
78
ThisBuild / startYear := Some(2023)
89
ThisBuild / licenses := Seq("EPL-2.0" -> url("https://www.eclipse.org/legal/epl-2.0/"))
@@ -11,7 +12,7 @@ ThisBuild / developers ++= List(
1112
tlGitHubDev("rlemaitre", "Raphaël Lemaitre")
1213
)
1314

14-
//ThisBuild / sonatypeCredentialHost := sonatypeCentralHost
15+
ThisBuild / sonatypeCredentialHost := sonatypeCentralHost
1516
ThisBuild / sonatypeProjectHosting := Some(GitHubHosting(
1617
"FunktionalIO",
1718
"pillars",
@@ -266,7 +267,7 @@ lazy val pillars = project
266267
version.value,
267268
"-project-logo",
268269
"modules/docs/src/docs/images/logo.png",
269-
// "-source-links:github://rlemaitre/pillars",
270+
// "-source-links:github://FunktionalIO/pillars",
270271
"-social-links:github::https://github.com/FunktionalIO/pillars"
271272
),
272273
unusedCompileDependenciesFilter -= moduleFilter("org.typelevel", "scalac-compat-annotation")

modules/docs/src/docs/contribute/10_contributing.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ There are other easy ways to support the project and show your appreciation, whi
3232
=== Code of Conduct
3333

3434
This project and everyone participating in it is governed by the
35-
link:https://github.com/rlemaitre/pillarsblob/master/CODE_OF_CONDUCT.md[Pillars Code of Conduct].
35+
link:https://github.com/FunktionalIO/pillars/blob/master/CODE_OF_CONDUCT.md[Pillars Code of Conduct].
3636
By participating, you are expected to uphold this code.
3737
Please report unacceptable behavior to mailto:[email protected][].
3838

@@ -43,13 +43,13 @@ Please report unacceptable behavior to mailto:[email protected][].
4343
[NOTE]
4444
If you want to ask a question, we assume that you have read the available link:https://pillars.dev[Documentation].
4545

46-
Before you ask a question, it is best to search for existing link:https://github.com/rlemaitre/pillars/issues[Issues] that might help you.
46+
Before you ask a question, it is best to search for existing link:https://github.com/FunktionalIO/pillars/issues[Issues] that might help you.
4747
In case you have found a suitable issue and still need clarification, you can write your question in this issue.
4848
It is also advisable to search the internet for answers first.
4949

5050
If you then still feel the need to ask a question and need clarification, we recommend the following:
5151

52-
* Open an https://github.com/rlemaitre/pillars/issues/new[Issue].
52+
* Open an https://github.com/FunktionalIO/pillars/issues/new[Issue].
5353
* Provide as much context as you can about what you're running into.
5454
* Provide project and platform versions (scala, sbt, etc), depending on what seems relevant.
5555

@@ -70,7 +70,7 @@ Please complete the following steps in advance to help us fix any potential bug
7070

7171
* Make sure that you are using the latest version.
7272
* Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the link:https://pillars.dev[documentation]. If you are looking for support, you might want to check <<i-have-a-question, this section>>.
73-
* To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the link:https://github.com/rlemaitre/pillarsissues?q=label%3Abug[bug tracker].
73+
* To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the link:https://github.com/FunktionalIO/pillars/issues?q=label%3Abug[bug tracker].
7474
* Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
7575
* Collect information about the bug:
7676
* Stack trace (Traceback)
@@ -88,7 +88,7 @@ Instead, sensitive bugs must be sent by email to mailto:[email protected][].
8888
We use GitHub issues to track bugs and errors.
8989
If you run into an issue with the project:
9090

91-
* Open an link:https://github.com/rlemaitre/pillars/issues/new[Issue].
91+
* Open an link:https://github.com/FunktionalIO/pillars/issues/new[Issue].
9292
(Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
9393
* Explain the behavior you would expect and the actual behavior.
9494
* Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own.
@@ -114,7 +114,7 @@ Following these guidelines will help maintainers and the community to understand
114114

115115
* Make sure that you are using the latest version.
116116
* Read the link:https://pillars.pillars.dev[documentation] carefully and find out if the functionality is already covered, maybe by an individual configuration.
117-
* Perform a link:https://github.com/rlemaitre/pillars/issues[search] to see if the enhancement has already been suggested.
117+
* Perform a link:https://github.com/FunktionalIO/pillars/issues[search] to see if the enhancement has already been suggested.
118118
If it has, add a comment to the existing issue instead of opening a new one.
119119
* Find out whether your idea fits with the scope and aims of the project.
120120
It's up to you to make a strong case to convince the project's developers of the merits of this feature.
@@ -123,7 +123,7 @@ If you're just targeting a minority of users, consider writing an add-on/plugin
123123

124124
===== How Do I Submit a Good Enhancement Suggestion?
125125

126-
Enhancement suggestions are tracked as link:https://github.com/rlemaitre/pillars/issues[GitHub issues].
126+
Enhancement suggestions are tracked as link:https://github.com/FunktionalIO/pillars/issues[GitHub issues].
127127

128128
* Use a *clear and descriptive title* for the issue to identify the suggestion.
129129
* Provide a *step-by-step description of the suggested enhancement* in as many details as possible.

modules/docs/src/docs/user-guide/10_quick-start.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ To use the latest version, include the following in your `build.sbt`:
2525
[source,sbt,subs="+attributes"]
2626
--
2727
libraryDependencies ++= Seq(
28-
"com.rlemaitre" %% "pillars-core" % "{site_version}"
28+
"io.funktional" %% "pillars-core" % "{site_version}"
2929
)
3030
--
3131

@@ -34,10 +34,10 @@ You can also add optional modules to your dependencies:
3434
[source,sbt,subs="+attributes"]
3535
--
3636
libraryDependencies ++= Seq(
37-
"com.rlemaitre" %% "pillars-db" % "{site_version}",
38-
"com.rlemaitre" %% "pillars-db-migration" % "{site_version}",
39-
"com.rlemaitre" %% "pillars-flags" % "{site_version}",
40-
"com.rlemaitre" %% "pillars-http-client" % "{site_version}"
37+
"io.funktional" %% "pillars-db" % "{site_version}",
38+
"io.funktional" %% "pillars-db-migration" % "{site_version}",
39+
"io.funktional" %% "pillars-flags" % "{site_version}",
40+
"io.funktional" %% "pillars-http-client" % "{site_version}"
4141
)
4242
--
4343

modules/docs/src/site/assets/humans.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Creator: Raphaël Lemaitre
33
Site: https://rlemaitre.com
44
Contact: contact [at] rlemaitre [dot] com
5-
Twitter: @rlemaitre
5+
Bluesky: @rlemaitre.com
66
Location: Paris, France
77

88
/* THANKS */
@@ -11,4 +11,4 @@ Name: @mjbprod for the logo design and her support
1111
/* SITE */
1212
Standards: HTML5, CSS3
1313
Components: Modernizr, jQuery, etc.
14-
Software: docToolchain <https://doctoolchain.org>
14+
Software: docToolchain <https://doctoolchain.org>

modules/docs/src/site/doc/landingpage.gsp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,31 +43,31 @@ end app
4343
<li class="tab" data-tab="maven">Maven</li>
4444
</ul>
4545
<pre class="code tab__pane active sbt">
46-
<code class="highlight language-scala">libraryDependencies ++= Seq("com.rlemaitre" %% "pillars-core" % "${config.site_version}")</code>
46+
<code class="highlight language-scala">libraryDependencies ++= Seq("io.funktional" %% "pillars-core" % "${config.site_version}")</code>
4747
</pre>
4848
<pre class="code tab__pane mill">
49-
<code class="highlight language-scala">ivy"com.rlemaitre::pillars-core:${config.site_version}"</code>
49+
<code class="highlight language-scala">ivy"io.funktional::pillars-core:${config.site_version}"</code>
5050
</pre>
5151
<pre class="code tab__pane scala-cli">
52-
<code class="highlight language-scala">//> using dep com.rlemaitre::pillars-core:${config.site_version}</code>
52+
<code class="highlight language-scala">//> using dep io.funktional::pillars-core:${config.site_version}</code>
5353
</pre>
5454
<pre class="code tab__pane pants">
5555
<code class="highlight language-scala">
5656
scala_artifact(
57-
group="com.rlemaitre",
57+
group="io.funktional",
5858
artifact="pillars-core",
5959
version="${config.site_version}",
6060
packages=["pillars.**"],
6161
)
6262
</code>
6363
</pre>
6464
<pre class="code tab__pane gradle">
65-
<code class="highlight language-gradle">implementation 'com.rlemaitre:pillars-core:${config.site_version}'</code>
65+
<code class="highlight language-gradle">implementation 'io.funktional:pillars-core:${config.site_version}'</code>
6666
</pre>
6767
<pre class="code tab__pane maven">
6868
<code class="highlight language-xml">
6969
&lt;dependency>
70-
&lt;groupId>com.rlemaitre&lt;/groupId>
70+
&lt;groupId>io.funktional&lt;/groupId>
7171
&lt;artifactId>pillars-core&lt;/artifactId>
7272
&lt;version>${config.site_version}&lt;/version>
7373
&lt;/dependency>

modules/docs/src/site/templates/header.gsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<meta content="Pillars" itemprop="name">
2828
<meta content="Build your backend service in Scala 3 the easy way" itemprop="description">
2929
<meta content="summary" name="twitter:card">
30-
<meta content="@rlemaitre" name="twitter:creator">
30+
<meta content="@rlemaitre.com" name="twitter:creator">
3131
<meta content="Pillars" name="twitter:title">
3232
<meta content="Build your backend service in Scala 3 the easy way" name="twitter:description">
3333
<meta property="og:url" content="https://pillars.dev/" />

modules/docs/src/site/templates/menu.gsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
}
2323
%>
2424
<li class="menu__item"><a href="${content.rootpath}api/" class="link link--dark"><i class="fa fa-cogs"></i> API</a></li>
25-
<li class="menu__item"><a href="https://github.com/rlemaitre/pillars/" class="link link--dark"><i class="fa fa-github"></i> Github</a></li>
25+
<li class="menu__item"><a href="https://github.com/FunktionalIO/pillars/" class="link link--dark"><i class="fa fa-github"></i> Github</a></li>
2626
<li class="menu__item">
2727
<form action="${content.rootpath}search.html">
2828
<input aria-label="Search this site…" autocomplete="off" class="form-control td-search-input"

modules/docs/src/site/templates/page.gsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<article class="doc__content">
1111
<%include "main.gsp"%>
1212
<script src="https://giscus.app/client.js"
13-
data-repo="rlemaitre/pillars"
13+
data-repo="FunktionalIO/pillars"
1414
data-repo-id="R_kgDOK-Le0g"
1515
data-category="Comments"
1616
data-category-id="DIC_kwDOK-Le0s4Ccs4S"

0 commit comments

Comments
 (0)