Added updates, updated version, updated build deps

master Version_3.2
Robinson 2023-01-16 23:15:05 +01:00
parent db97289203
commit 8b95725ad6
No known key found for this signature in database
GPG Key ID: 8E7DB78588BD6F5C
6 changed files with 41 additions and 76 deletions

13
LICENSE
View File

@ -1,6 +1,13 @@
- Annotations - Extremely fast, lightweight annotation scanner for the classpath, classloader, or files for Java 11
- Annotations - Extremely fast, lightweight annotation scanner for the classpath, classloader, or files for Java 8+
[The Apache Software License, Version 2.0]
https://git.dorkbox.com/dorkbox/Annotations
Copyright 2020
Copyright 2023
Dorkbox LLC
Copyright 2014, XIAM Solutions B.V. (http://www.xiam.nl)
Extra license information
- INFOMAS ASL -
[The Apache Software License, Version 2.0]
https://github.com/rmuller/infomas-asl
https://www.xiam.nl
Copyright 2016
XIAM Solutions B.V.

View File

@ -1,21 +0,0 @@
MIT License
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

View File

@ -47,7 +47,7 @@ Maven Info
<dependency>
<groupId>com.dorkbox</groupId>
<artifactId>Annotations</artifactId>
<version>3.1</version>
<version>3.2</version>
</dependency>
</dependencies>
```

View File

@ -1,5 +1,5 @@
/*
* Copyright 2020 dorkbox, llc
* Copyright 2023 dorkbox, llc
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,6 +14,7 @@
* limitations under the License.
*/
import java.time.Instant
@ -29,20 +30,19 @@ gradle.startParameter.warningMode = WarningMode.All
plugins {
java
id("com.dorkbox.GradleUtils") version "1.16"
id("com.dorkbox.Licensing") version "2.12"
id("com.dorkbox.VersionUpdate") version "2.4"
id("com.dorkbox.GradlePublish") version "1.12"
id("com.dorkbox.GradleModuleInfo") version "1.1"
id("com.dorkbox.GradleUtils") version "3.7"
id("com.dorkbox.Licensing") version "2.18"
id("com.dorkbox.VersionUpdate") version "2.5"
id("com.dorkbox.GradlePublish") version "1.15"
kotlin("jvm") version "1.6.10"
kotlin("jvm") version "1.8.0"
}
object Extras {
// set for the project
const val description = "Extremely fast, lightweight annotation scanner for the classpath, classloader, or files for Java 11"
const val description = "Extremely fast, lightweight annotation scanner for the classpath, classloader, or files for Java 8+"
const val group = "com.dorkbox"
const val version = "3.1"
const val version = "3.2"
// set as project.ext
const val name = "Annotations"
@ -57,9 +57,9 @@ object Extras {
///// assign 'Extras'
///////////////////////////////
GradleUtils.load("$projectDir/../../gradle.properties", Extras)
GradleUtils.fixIntellijPaths()
GradleUtils.defaultResolutionStrategy()
GradleUtils.compileConfiguration(JavaVersion.VERSION_11)
GradleUtils.defaults()
GradleUtils.compileConfiguration(JavaVersion.VERSION_1_8)
GradleUtils.jpms(JavaVersion.VERSION_1_9)
licensing {
@ -67,24 +67,19 @@ licensing {
description(Extras.description)
author(Extras.vendor)
url(Extras.url)
note("Copyright 2014, XIAM Solutions B.V. (http://www.xiam.nl)")
}
}
sourceSets {
main {
java {
setSrcDirs(listOf("src"))
// want to include java files for the source. 'setSrcDirs' resets includes...
include("**/*.java")
extra("INFOMAS ASL", License.APACHE_2) {
copyright(2016)
author("XIAM Solutions B.V.")
url("https://github.com/rmuller/infomas-asl")
url("https://www.xiam.nl")
}
}
}
repositories {
mavenLocal() // this must be first!
jcenter()
dependencies {
api("com.dorkbox:Updates:1.1")
}
tasks.jar.get().apply {
@ -104,10 +99,6 @@ tasks.jar.get().apply {
}
}
dependencies {
}
publishToSonatype {
groupId = Extras.group
artifactId = Extras.id

View File

@ -1,18 +1,11 @@
/* AnnotationDetector.java
*
* Created: 2011-10-10 (Year-Month-Day)
* Character encoding: UTF-8
*
****************************************** LICENSE *******************************************
*
* Copyright (c) 2011 - 2014 XIAM Solutions B.V. (http://www.xiam.nl)
* Copyright 2014 dorkbox, llc
/*
* Copyright 2023 dorkbox, llc
*
* 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
* 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,
@ -157,6 +150,11 @@ class AnnotationDetector implements Builder, Cursor {
private static final int CLASS = 'c';
private static final int ANNOTATION = '@';
static {
// Add this project to the updates system, which verifies this class + UUID + version information
dorkbox.updates.Updates.INSTANCE.add(AnnotationDetector.class, "27e311d499c94b1aa0a879710429964d", getVersion());
}
private final ClassLoader loader;
// The buffer is reused during the life cycle of this AnnotationDetector instance
private final ClassFileBuffer cpBuffer = new ClassFileBuffer();
@ -217,7 +215,7 @@ class AnnotationDetector implements Builder, Cursor {
*/
public static
String getVersion() {
return "3.1";
return "3.2";
}
/**
@ -1031,4 +1029,3 @@ class AnnotationDetector implements Builder, Cursor {
return new AssertionError(String.format(message, args));
}
}

View File

@ -1,15 +1,6 @@
module dorkbox.annotation {
exports dorkbox.annotation;
// requires transitive dorkbox.collections;
// requires transitive dorkbox.executor;
// requires transitive dorkbox.desktop;
// requires transitive dorkbox.jna;
// requires transitive dorkbox.updates;
// requires transitive dorkbox.utilities;
// requires transitive dorkbox.os;
// requires transitive org.slf4j;
requires transitive dorkbox.updates;
// requires transitive kotlin.stdlib;
}