diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index b2633a5..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,155 +0,0 @@ -# This file was automatically generated by sbt-github-actions using the -# githubWorkflowGenerate task. You should add and commit this file to -# your git repository. It goes without saying that you shouldn't edit -# this file by hand! Instead, if you wish to make changes, you should -# change your sbt build configuration to revise the workflow description -# to meet your needs, then regenerate this file. - -name: Continuous Integration - -on: - pull_request: - branches: ['**'] - push: - branches: ['**'] - tags: [v*] - -env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - -jobs: - build: - name: Build and Test - strategy: - matrix: - os: [ubuntu-latest] - scala: [2.11.12, 2.12.15, 2.13.8] - java: [adopt-hotspot@8, adopt-hotspot@11] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout current branch (full) - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Setup Java (adopt-hotspot@8) - if: matrix.java == 'adopt-hotspot@8' - uses: actions/setup-java@v2 - with: - distribution: adopt-hotspot - java-version: 8 - - - name: Setup Java (adopt-hotspot@11) - if: matrix.java == 'adopt-hotspot@11' - uses: actions/setup-java@v2 - with: - distribution: adopt-hotspot - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - run: sbt ++${{ matrix.scala }} scalafmtCheckAll - - - name: Check that workflows are up to date - run: sbt ++${{ matrix.scala }} githubWorkflowCheck - - - name: Build project - run: sbt ++${{ matrix.scala }} test - - - name: Compress target directories - run: tar cf targets.tar target project/target - - - name: Upload target directories - uses: actions/upload-artifact@v2 - with: - name: target-${{ matrix.os }}-${{ matrix.scala }}-${{ matrix.java }} - path: targets.tar - - publish: - name: Publish Artifacts - needs: [build] - if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v')) - strategy: - matrix: - os: [ubuntu-latest] - scala: [2.12.15] - java: [adopt-hotspot@8] - runs-on: ${{ matrix.os }} - steps: - - name: Checkout current branch (full) - uses: actions/checkout@v2 - with: - fetch-depth: 0 - - - name: Setup Java (adopt-hotspot@8) - if: matrix.java == 'adopt-hotspot@8' - uses: actions/setup-java@v2 - with: - distribution: adopt-hotspot - java-version: 8 - - - name: Setup Java (adopt-hotspot@11) - if: matrix.java == 'adopt-hotspot@11' - uses: actions/setup-java@v2 - with: - distribution: adopt-hotspot - java-version: 11 - - - name: Cache sbt - uses: actions/cache@v2 - with: - path: | - ~/.sbt - ~/.ivy2/cache - ~/.coursier/cache/v1 - ~/.cache/coursier/v1 - ~/AppData/Local/Coursier/Cache/v1 - ~/Library/Caches/Coursier/v1 - key: ${{ runner.os }}-sbt-cache-v2-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }} - - - name: Download target directories (2.11.12) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-2.11.12-${{ matrix.java }} - - - name: Inflate target directories (2.11.12) - run: | - tar xf targets.tar - rm targets.tar - - - name: Download target directories (2.12.15) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-2.12.15-${{ matrix.java }} - - - name: Inflate target directories (2.12.15) - run: | - tar xf targets.tar - rm targets.tar - - - name: Download target directories (2.13.8) - uses: actions/download-artifact@v2 - with: - name: target-${{ matrix.os }}-2.13.8-${{ matrix.java }} - - - name: Inflate target directories (2.13.8) - run: | - tar xf targets.tar - rm targets.tar - - - env: - PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} - PGP_SECRET: ${{ secrets.PGP_SECRET }} - SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }} - SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} - run: sbt ++${{ matrix.scala }} ci-release diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml deleted file mode 100644 index 547aaa4..0000000 --- a/.github/workflows/clean.yml +++ /dev/null @@ -1,59 +0,0 @@ -# This file was automatically generated by sbt-github-actions using the -# githubWorkflowGenerate task. You should add and commit this file to -# your git repository. It goes without saying that you shouldn't edit -# this file by hand! Instead, if you wish to make changes, you should -# change your sbt build configuration to revise the workflow description -# to meet your needs, then regenerate this file. - -name: Clean - -on: push - -jobs: - delete-artifacts: - name: Delete Artifacts - runs-on: ubuntu-latest - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - steps: - - name: Delete artifacts - run: | - # Customize those three lines with your repository and credentials: - REPO=${GITHUB_API_URL}/repos/${{ github.repository }} - - # A shortcut to call GitHub API. - ghapi() { curl --silent --location --user _:$GITHUB_TOKEN "$@"; } - - # A temporary file which receives HTTP response headers. - TMPFILE=/tmp/tmp.$$ - - # An associative array, key: artifact name, value: number of artifacts of that name. - declare -A ARTCOUNT - - # Process all artifacts on this repository, loop on returned "pages". - URL=$REPO/actions/artifacts - while [[ -n "$URL" ]]; do - - # Get current page, get response headers in a temporary file. - JSON=$(ghapi --dump-header $TMPFILE "$URL") - - # Get URL of next page. Will be empty if we are at the last page. - URL=$(grep '^Link:' "$TMPFILE" | tr ',' '\n' | grep 'rel="next"' | head -1 | sed -e 's/.*/' -e 's/>.*//') - rm -f $TMPFILE - - # Number of artifacts on this page: - COUNT=$(( $(jq <<<$JSON -r '.artifacts | length') )) - - # Loop on all artifacts on this page. - for ((i=0; $i < $COUNT; i++)); do - - # Get name of artifact and count instances of this name. - name=$(jq <<<$JSON -r ".artifacts[$i].name?") - ARTCOUNT[$name]=$(( $(( ${ARTCOUNT[$name]} )) + 1)) - - id=$(jq <<<$JSON -r ".artifacts[$i].id?") - size=$(( $(jq <<<$JSON -r ".artifacts[$i].size_in_bytes?") )) - printf "Deleting '%s' #%d, %'d bytes\n" $name ${ARTCOUNT[$name]} $size - ghapi -X DELETE $REPO/actions/artifacts/$id - done - done diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 8577b3c..0000000 --- a/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -# folders -.idea -target -lib -classes -.bsp - -# files -*.iml diff --git a/.nojekyll b/.nojekyll new file mode 100644 index 0000000..e69de29 diff --git a/.scalafmt.conf b/.scalafmt.conf deleted file mode 100644 index c87acf6..0000000 --- a/.scalafmt.conf +++ /dev/null @@ -1,15 +0,0 @@ -version = 3.4.3 -runner.dialect = scala213 -project.git = true - -maxColumn = 120 -docstrings.oneline = fold -align.preset = more - -rewrite.rules = [ - PreferCurlyFors - RedundantBraces # maybe non-idempotent - RedundantParens - SortImports - SortModifiers -] diff --git a/LICENSE b/LICENSE deleted file mode 100644 index ea2712c..0000000 --- a/LICENSE +++ /dev/null @@ -1,176 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS diff --git a/README.md b/README.md deleted file mode 100644 index 85f0eef..0000000 --- a/README.md +++ /dev/null @@ -1,35 +0,0 @@ -Scaldi -======== - - -[](https://maven-badges.herokuapp.com/maven-central/org.scaldi/scaldi_2.13) - -Scaldi provides a simple and elegant way to do dependency injection in Scala. -By using the expressive power of the Scala language, it defines an intuitive and -idiomatic DSL for binding and injecting dependencies. It is a highly extensible -library; you can easily customise almost any aspect of it. Some of its more unique -features are advanced module composition and conditional bindings, which can -help you build all kinds of applications - from small command-line tools to -large web applications. Scaldi also integrates nicely with Akka and Play. - -The Scaldi documentation DNS record ownership is in flux. -Until that is resolved, you may need to rely on the original project's documentation. -You can find an archive of the original project's homepage -[here](https://web.archive.org/web/20190616212058/http://scaldi.org/), or jump directly -to the documentation -[here](https://web.archive.org/web/20190618005634/http://scaldi.org/learn). Due to it -being an archived website, some of the links on it may not work properly. - -## Adding Scaldi to Your Build - -SBT Configuration: - -```sbtshell -libraryDependencies += "org.scaldi" %% "scaldi" % x.y.z -``` - -Scaldi supports Scala 2.11, 2.12 and 2.13. - -## License - -**Scaldi** is licensed under [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). diff --git a/build.sbt b/build.sbt deleted file mode 100644 index 2c6eba5..0000000 --- a/build.sbt +++ /dev/null @@ -1,81 +0,0 @@ -name := "scaldi" -organization := "org.scaldi" - -description := "Scaldi - Scala Dependency Injection Library" -homepage := Some(url("https://github.com/scaldi/scaldi")) -licenses := Seq("Apache License, ASL Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")) - -lazy val scala213 = "2.13.8" - -scalaVersion := scala213 -crossScalaVersions := Seq("2.11.12", "2.12.15", scala213) -mimaPreviousArtifacts := Set("0.6.0").map(organization.value %% name.value % _) -scalacOptions ++= Seq("-deprecation", "-feature") - -libraryDependencies ++= Seq( - "org.scala-lang" % "scala-reflect" % scalaVersion.value, - "org.scala-lang.modules" %% "scala-collection-compat" % "2.7.0", - "com.typesafe" % "config" % "1.4.2" % Optional, - "org.scalatest" %% "scalatest" % "3.2.12" % Test -) - -fork := true -git.remoteRepo := "git@github.com:scaldi/scaldi.git" - -// Publishing - -pomIncludeRepository := (_ => false) -Test / publishArtifact := false -ThisBuild / githubWorkflowTargetTags ++= Seq("v*") -ThisBuild / githubWorkflowScalaVersions := crossScalaVersions.value -ThisBuild / githubWorkflowJavaVersions := Seq("8", "11").map(JavaSpec(JavaSpec.Distribution.Adopt, _)) -ThisBuild / githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))) -ThisBuild / githubWorkflowBuildPreamble := Seq(WorkflowStep.Sbt(List("scalafmtCheckAll"))) -ThisBuild / githubWorkflowPublish := Seq( - WorkflowStep.Sbt( - List("ci-release"), - env = Map( - "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}", - "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}", - "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}", - "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}" - ) - ) -) - -// Site and docs - -enablePlugins(SiteScaladocPlugin) -enablePlugins(GhpagesPlugin) - -// nice *magenta* prompt! - -ThisBuild / shellPrompt := { state => - scala.Console.MAGENTA + Project.extract(state).currentRef.project + "> " + scala.Console.RESET -} - -// Additional meta-info - -startYear := Some(2011) -organizationHomepage := Some(url("https://github.com/scaldi")) -scmInfo := Some( - ScmInfo( - browseUrl = url("https://github.com/scaldi/scaldi"), - connection = "scm:git:git@github.com:scaldi/scaldi.git" - ) -) -developers := List( - Developer("AprilAtProtenus", "April Hyacinth", "april@protenus.com", url("https://github.com/AprilAtProtenus")), - Developer("dave-handy", "Dave Handy", "wdhandy@gmail.com", url("https://github.com/dave-handy")) -) - -// Scalafmt aliases -scalafmtCheckAll := { - (Compile / scalafmtSbtCheck).value - scalafmtCheckAll.value -} - -scalafmtAll := { - (Compile / scalafmtSbt).value - scalafmtAll.value -} diff --git a/latest/api/deprecated-list.html b/latest/api/deprecated-list.html new file mode 100644 index 0000000..124110c --- /dev/null +++ b/latest/api/deprecated-list.html @@ -0,0 +1,32 @@ + + +
+
+
+
+
+ | t |
Scaldi - is Scala dependency injection library. Basically Scala already have everything you need for dependency +injection. But still some things can be made easier. Goal of the project is to provide more standard and easy way +to make dependency injection in Scala projects consuming power of the Scala language. With Scaldi you can define +your application modules in pure Scala without any annotations or XML.
For more information see: http://olegilyenko.github.com/scaldi/Scaldi.html +