Skip to content

Commit cccef8f

Browse files
authored
Road grading; refreshes dependencies (#11)
Signed-off-by: Laird Nelson <[email protected]>
1 parent 6685453 commit cccef8f

13 files changed

Lines changed: 670 additions & 466 deletions

File tree

README.md

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
# microBean™ Scopelet
22

3-
[![Maven Central](https://img.shields.io/maven-central/v/org.microbean/microbean-scopelet.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.microbean/microbean-scopelet)
3+
[![Maven Central](https://img.shields.io/maven-central/v/org.microbean/microbean-producer.svg?label=Maven%20Central)](https://central.sonatype.com/artifact/org.microbean/microbean-scopelet)
44

5-
The microBean™ Scopelet project provides classes and interfaces assisting with implementing dependency injection scopes.
5+
![0% AI](https://img.shields.io/badge/%F0%9F%A4%96_AI-0%25_%F0%9F%8C%BC-brightgreen)
6+
7+
The microBean™ Scopelet™ project provides classes and interfaces assisting with implementing dependency injection
8+
scopes.
69

710
# Status
811

@@ -15,19 +18,20 @@ changes, regardless of project version and without notice.**
1518

1619
# Requirements
1720

18-
microBean™ Scopelet requires a Java runtime of version 16 or higher.
21+
microBean™ Scopelet requires a Java runtime of version 16 or higher.
1922

2023
# Installation
2124

22-
microBean™ Scopelet is available on [Maven Central](https://search.maven.org/). Include microBean™ Scopelet as a Maven
23-
dependency:
25+
microBean™ Scopelet™ is available on [Maven
26+
Central](https://central.sonatype.com/artifact/org.microbean/microbean-scopelet). Include microBean™ Scopelet™ as a
27+
Maven dependency:
2428

2529
```xml
2630
<dependency>
2731
<groupId>org.microbean</groupId>
2832
<artifactId>microbean-scopelet</artifactId>
29-
<!-- Always check https://search.maven.org/artifact/org.microbean/microbean-scopelet for up-to-date available versions. -->
30-
<version>0.0.11</version>
33+
<!-- Always check https://central.sonatype.com/artifact/org.microbean/microbean-scopelet for up-to-date available versions. -->
34+
<version>0.0.12</version>
3135
</dependency>
3236
```
3337

pom.xml

Lines changed: 11 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<!-- maven-javadoc-plugin properties -->
7272
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}&ndash;{currentYear}, <a href="${project.organization.url}" target="_top">${project.organization.name}</a>. All rights reserved.]]></bottom>
7373
<doctitle>&lt;a href="${project.url}" target="_top"&gt;&lt;span style="font-family:Lobster, cursive;"&gt;µb&lt;/span&gt; ${project.artifactId}&lt;/a&gt; ${project.version}</doctitle>
74-
<links>https://microbean.github.io/microbean-assign/apidocs/,https://microbean.github.io/microbean-attributes/apidocs/,https://microbean.github.io/microbean-bean/apidocs/,https://microbean.github.io/microbean-construct/apidocs/,https://microbean.github.io/microbean-reference/apidocs/</links>
74+
<links>https://microbean.github.io/microbean-assign/apidocs/,https://microbean.github.io/microbean-bean/apidocs/,https://microbean.github.io/microbean-construct/apidocs/,https://microbean.github.io/microbean-reference/apidocs/</links>
7575
<sourcetab>2</sourcetab>
7676

7777
<!-- maven-release-plugin properties -->
@@ -121,37 +121,31 @@
121121
<dependency>
122122
<groupId>org.microbean</groupId>
123123
<artifactId>microbean-assign</artifactId>
124-
<version>0.0.11</version>
125-
</dependency>
126-
127-
<dependency>
128-
<groupId>org.microbean</groupId>
129-
<artifactId>microbean-attributes</artifactId>
130-
<version>0.0.5</version>
124+
<version>0.0.14</version>
131125
</dependency>
132126

133127
<dependency>
134128
<groupId>org.microbean</groupId>
135129
<artifactId>microbean-bean</artifactId>
136-
<version>0.0.22</version>
130+
<version>0.0.23</version>
137131
</dependency>
138132

139133
<dependency>
140134
<groupId>org.microbean</groupId>
141135
<artifactId>microbean-construct</artifactId>
142-
<version>0.0.18</version>
136+
<version>0.0.24</version>
143137
</dependency>
144138

145139
<dependency>
146140
<groupId>org.microbean</groupId>
147141
<artifactId>microbean-event</artifactId> <!-- scopelets fire events -->
148-
<version>0.0.3</version>
142+
<version>0.0.4</version>
149143
</dependency>
150144

151145
<dependency>
152146
<groupId>org.microbean</groupId>
153147
<artifactId>microbean-reference</artifactId>
154-
<version>0.0.5</version>
148+
<version>0.0.6</version>
155149
</dependency>
156150

157151
</dependencies>
@@ -165,12 +159,6 @@
165159
<scope>compile</scope>
166160
</dependency>
167161

168-
<dependency>
169-
<groupId>org.microbean</groupId>
170-
<artifactId>microbean-attributes</artifactId>
171-
<scope>compile</scope>
172-
</dependency>
173-
174162
<dependency>
175163
<groupId>org.microbean</groupId>
176164
<artifactId>microbean-bean</artifactId>
@@ -330,7 +318,7 @@
330318
<dependency>
331319
<groupId>com.puppycrawl.tools</groupId>
332320
<artifactId>checkstyle</artifactId>
333-
<version>12.3.0</version>
321+
<version>13.0.0</version>
334322
</dependency>
335323
</dependencies>
336324
</plugin>
@@ -351,7 +339,7 @@
351339
</plugin>
352340
<plugin>
353341
<artifactId>maven-compiler-plugin</artifactId>
354-
<version>3.14.1</version>
342+
<version>3.15.0</version>
355343
<configuration>
356344
<compilerArgs>
357345
<arg>-Xlint:all</arg>
@@ -361,7 +349,7 @@
361349
</plugin>
362350
<plugin>
363351
<artifactId>maven-dependency-plugin</artifactId>
364-
<version>3.9.0</version>
352+
<version>3.10.0</version>
365353
</plugin>
366354
<plugin>
367355
<artifactId>maven-deploy-plugin</artifactId>
@@ -463,7 +451,7 @@
463451
<plugin>
464452
<groupId>org.codehaus.mojo</groupId>
465453
<artifactId>versions-maven-plugin</artifactId>
466-
<version>2.20.1</version>
454+
<version>2.21.0</version>
467455
</plugin>
468456
<plugin>
469457
<groupId>io.smallrye</groupId>
@@ -473,7 +461,7 @@
473461
<plugin>
474462
<groupId>org.sonatype.central</groupId>
475463
<artifactId>central-publishing-maven-plugin</artifactId>
476-
<version>0.9.0</version>
464+
<version>0.10.0</version>
477465
<extensions>true</extensions>
478466
<configuration>
479467
<publishingServerId>central.sonatype.com</publishingServerId>

src/main/java/module-info.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- mode: Java; c-basic-offset: 2; indent-tabs-mode: nil; coding: utf-8-unix -*-
22
*
3-
* Copyright © 2023–2025 microBean™.
3+
* Copyright © 2023–2026 microBean™.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
@@ -22,7 +22,6 @@
2222
exports org.microbean.scopelet;
2323

2424
requires transitive org.microbean.assign;
25-
requires org.microbean.attributes;
2625
requires transitive org.microbean.bean;
2726
requires org.microbean.constant;
2827
requires org.microbean.construct;

src/main/java/org/microbean/scopelet/Instance.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- mode: Java; c-basic-offset: 2; indent-tabs-mode: nil; coding: utf-8-unix -*-
22
*
3-
* Copyright © 2023–2025 microBean™.
3+
* Copyright © 2023–2026 microBean™.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
@@ -84,8 +84,8 @@ final class Instance<I> implements AutoCloseable, Supplier<I> {
8484
* @param destruction a {@link Destruction}; may be {@code null}
8585
*/
8686
Instance(final I contextualInstance,
87-
final Destructor<I> destructor,
88-
final Destruction destruction) {
87+
final Destructor<I> destructor,
88+
final Destruction destruction) {
8989
super();
9090
this.destruction = destruction;
9191
this.object = contextualInstance;

src/main/java/org/microbean/scopelet/MapBackedScopelet.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- mode: Java; c-basic-offset: 2; indent-tabs-mode: nil; coding: utf-8-unix -*-
22
*
3-
* Copyright © 2023–2025 microBean™.
3+
* Copyright © 2023–2026 microBean™.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
@@ -168,8 +168,8 @@ private final <I> Supplier<I> supplier(final Object id,
168168
@SuppressWarnings("unchecked")
169169
final Instance<I> newInstance =
170170
new Instance<I>(factory == this ? (I)this : factory.create(creation),
171-
factory::destroy, // Destructor
172-
(Destruction)creation);
171+
factory::destroy, // Destructor
172+
(Destruction)creation);
173173

174174
// Put the created instance into our instance map. There will not be a pre-existing instance.
175175
final Object previous = this.instances.put(id, newInstance);

src/main/java/org/microbean/scopelet/NoneScopelet.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* -*- mode: Java; c-basic-offset: 2; indent-tabs-mode: nil; coding: utf-8-unix -*-
22
*
3-
* Copyright © 2023–2025 microBean™.
3+
* Copyright © 2023–2026 microBean™.
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
@@ -15,7 +15,6 @@
1515

1616
import java.lang.System.Logger;
1717

18-
import java.lang.constant.ClassDesc;
1918
import java.lang.constant.Constable;
2019
import java.lang.constant.ConstantDesc;
2120
import java.lang.constant.DynamicConstantDesc;
@@ -90,7 +89,7 @@ public NoneScopelet() {
9089
* @exception InactiveScopeletException if this {@link Scopelet} {@linkplain #active() is not active}
9190
*
9291
* @exception ClassCastException if destruction is called for, {@code creation} is non-{@code null}, and {@code
93-
* creation} does not implement {@link org.microbean.bean.Destruction}, a requirement of its contract
92+
* creation} does not implement {@link Destruction}, a requirement of its contract
9493
*
9594
* @see DestructorRegistry
9695
*
@@ -122,7 +121,7 @@ public <I> I instance(final Object ignoredBeanId, final Factory<I> factory, fina
122121

123122
@Override // Constable
124123
public Optional<? extends ConstantDesc> describeConstable() {
125-
return Optional.of(DynamicConstantDesc.of(BSM_INVOKE, ofConstructor(ClassDesc.of(this.getClass().getName()))));
124+
return Optional.of(DynamicConstantDesc.of(BSM_INVOKE, ofConstructor(this.getClass().describeConstable().orElseThrow())));
126125
}
127126

128127
}

0 commit comments

Comments
 (0)