Skip to content

Commit

Permalink
Preoaped release 0.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lefou committed Jun 24, 2023
1 parent 7cc19ae commit 490c0e1
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 17 deletions.
25 changes: 10 additions & 15 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
= mill-osgi - Build OSGi Bundles with mill
:mill-min-version: 0.6.0
:mill-osgi-version: 0.4.0
:mill-platform: 0.10
:example-scala-version: 2.13.8
:mill-osgi-version: 0.5.0
:mill-platform: 0.11
:example-scala-version: 2.13.11
:projectHome: https://github.com/lefou/mill-osgi
:toc:
:toc-placement: preamble
Expand Down Expand Up @@ -192,7 +192,8 @@ The following table shows a matrix of compatible mill and mill-osgi versions.
[options="header"]
|===
| mill-osgi | mill
| 0.4.0 | 0.6.0 -0.10.x
| 0.5.0 | 0.6.0 - 0.11.x
| 0.4.0 | 0.6.0 - 0.10.x
| 0.3.2 | 0.6.0 - 0.9.3
| 0.3.1 | 0.6.0 - 0.8.0
| 0.3.0 | 0.6.0 - 0.8.0
Expand All @@ -214,17 +215,6 @@ You can download binary releases from https://search.maven.org/search?q=g:de.tot

Please make sure to use the correct _mill platform suffix_ matching your used mill version.

.Mill Platform suffix
[options="header"]
|===
| mill version | mill platform | suffix | example
| 0.10.x | 0.10 | `_mill0.10` | ```$ivy.`de.tototec::de.tobiasroeser.mill.osgi::{mill-osgi-version}````
| 0.9.3 - | 0.9 | `_mill0.9` | ```$ivy.`de.tototec::de.tobiasroeser.mill.osgi_mill0.9:{mill-osgi-version}````
| 0.7.0 - 0.8.0 | 0.7 | `_mill0.7` | ```$ivy.`de.tototec::de.tobiasroeser.mill.osgi_mill0.7:{mill-osgi-version}````
| 0.6.0 - 0.6.3 | 0.6 | `_mill0.6` | ```$ivy.`de.tototec::de.tobiasroeser.mill.osgi_mill0.6:{mill-osgi-version}````
|===


== License

This project is published under the https://www.apache.org/licenses/LICENSE-2.0[Apache License, Version 2.0].
Expand Down Expand Up @@ -252,6 +242,11 @@ I also accept {projectHome}/pulls[pull requests].

== Changelog

=== mill-osgi 0.5.0 - 2023-06-24

* Added support for Mill 0.11 API
* Various dependency updates

=== mill-osgi 0.4.0 - 2022-01-16

* Improved `BuildMode.CalculateManifest` mode
Expand Down
4 changes: 2 additions & 2 deletions build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ trait MillOsgiModule extends ScalaModule with PublishModule with Cross.Module[St
override def artifactSuffix = s"_mill${deps.millPlatform}_${artifactScalaVersion()}"
def publishVersion = VcsVersion.vcsState().format()
override def javacOptions = Seq("-source", "1.8", "-target", "1.8", "-encoding", "UTF-8")
override def scalacOptions = Seq("-target:jvm-1.8", "-encoding", "UTF-8")
override def scalacOptions = Seq("-target:jvm-1.8", "-encoding", "UTF-8", "-deprecation", "-Xsource:3")
override def pomSettings = T {
PomSettings(
description = "Mill module adding OSGi bundle support",
Expand Down Expand Up @@ -167,7 +167,7 @@ trait ItestCross extends MillIntegrationTestModule with Cross.Module[String] {
override def prefetchIvyDeps = Agg(
ivy"com.typesafe.akka:akka-http-core_2.12:10.1.11"
)
override def sources: Sources = T.sources {
override def sources = T.sources {
super.sources() ++
ZincWorkerUtil.versionRanges(deps.millPlatform, millPlatforms.map(_._1))
.map(p => PathRef(millSourcePath / s"src-${p}"))
Expand Down

0 comments on commit 490c0e1

Please sign in to comment.