-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7 from agorapulse/chore/multiple-mn-versions
multiple mn versions
- Loading branch information
Showing
21 changed files
with
219 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Copyright 2019-2022 Agorapulse. | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| plugins { | ||
| id 'groovy-gradle-plugin' | ||
| id 'groovy' | ||
| } | ||
|
|
||
| repositories { | ||
| mavenCentral() | ||
| maven { url 'https://plugins.gradle.org/m2/' } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile gradleApi() | ||
| compile localGroovy() | ||
|
|
||
| compile 'io.spring.gradle:dependency-management-plugin:1.0.5.RELEASE' | ||
| compile 'com.github.jengelman.gradle.plugins:shadow:2.0.4' | ||
| } |
103 changes: 103 additions & 0 deletions
103
buildSrc/src/main/groovy/micronaut-compatibility.gradle
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * Copyright 2019-2022 Agorapulse. | ||
| * | ||
| * 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 | ||
| * | ||
| * https://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, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| import groovy.transform.Field | ||
|
|
||
| @Field static final Map<String, String> MICRONAUT_1 = [ | ||
| 'micronaut-runtime-groovy': 'io.micronaut', | ||
| 'micronaut-function-groovy': 'io.micronaut', | ||
| 'micronaut-function-aws': 'io.micronaut', | ||
| 'micronaut-aws-common': 'io.micronaut.configuration', | ||
| 'micronaut-security': 'io.micronaut', | ||
| 'micronaut-security-jwt': 'io.micronaut', | ||
| 'micronaut-jdbc-tomcat': 'io.micronaut.configuration', | ||
| 'micronaut-hibernate-gorm': 'io.micronaut.configuration', | ||
| 'micronaut-spring': 'io.micronaut', | ||
| ] | ||
|
|
||
| @Field static final Map<String, String> MICRONAUT_2 = [ | ||
| 'micronaut-runtime-groovy': 'io.micronaut.groovy', | ||
| 'micronaut-function-groovy': 'io.micronaut.groovy', | ||
| 'micronaut-function-aws': 'io.micronaut.aws', | ||
| 'micronaut-aws-common': 'io.micronaut.aws', | ||
| 'micronaut-security': 'io.micronaut.security', | ||
| 'micronaut-security-jwt': 'io.micronaut.security', | ||
| 'micronaut-jdbc-tomcat': 'io.micronaut.sql', | ||
| 'micronaut-hibernate-gorm': 'io.micronaut.groovy', | ||
| 'micronaut-spring': 'io.micronaut.spring', | ||
| ] | ||
|
|
||
| @Field static final Map<String, Object> IMPORTS = [ | ||
| 'javax.annotation.Nullable': 'io.micronaut.core.annotation.Nullable', | ||
| 'javax.annotation.Nonnull': 'io.micronaut.core.annotation.NonNull', | ||
| 'Nonnull': 'NonNull', | ||
| 'import javax.inject.': 'import jakarta.inject.', | ||
| 'io.micronaut.test.annotation.MicronautTest': [ | ||
| java: 'io.micronaut.test.extensions.junit5.annotation.MicronautTest', | ||
| groovy: 'io.micronaut.test.extensions.spock.annotation.MicronautTest', | ||
| ] | ||
| ] | ||
|
|
||
| ext.micronautMigratedDependency = { String module -> | ||
| Map<String, String> groups = project.getProperty('micronautVersion').startsWith('1') ? MICRONAUT_1 : MICRONAUT_2 | ||
| String group = groups[module] | ||
|
|
||
| if (!group) { | ||
| throw new IllegalArgumentException("Cannot find group for $module. Known modules: ${groups.keySet()}") | ||
| } | ||
|
|
||
| return "$group:$module" | ||
| } | ||
|
|
||
| pluginManager.withPlugin('java') { | ||
| tasks.register('migrateImports') { Task task -> | ||
| File javaSources = project.file('src/main/java') | ||
| File javaTestSources = project.file('src/test/java') | ||
| File groovySources = project.file('src/main/groovy') | ||
| File groovyTestSources = project.file('src/test/groovy') | ||
|
|
||
| List<File> dirs = [javaSources, javaTestSources, groovySources, groovyTestSources] | ||
|
|
||
| for (File dir in dirs) { | ||
| if (dir.exists()) { | ||
| task.inputs.dir dir | ||
| task.outputs.dir dir | ||
|
|
||
| task.doFirst { | ||
| task.inputs.files.forEach { File file -> | ||
| String content = file.text | ||
| String newContent = content | ||
|
|
||
| if (IMPORTS.keySet().any { String original -> content.contains(original) }) { | ||
| IMPORTS.each { String original, Object value -> | ||
| String replacement = value instanceof CharSequence ? value : (file.name.endsWith('.groovy') ? value['groovy'] : value['java']) | ||
| newContent = newContent.replace(original, replacement) | ||
| } | ||
| } | ||
|
|
||
| if (content != newContent) { | ||
| project.logger.lifecycle("Migrated imports in $file") | ||
| file.text = newContent | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-all.zip | ||
| zipStoreBase=GRADLE_USER_HOME | ||
| zipStorePath=wrapper/dists |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
libs/micronaut-rethrow/src/main/java/com/agorapulse/micronaut/rethrow/Rethrow.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...aut-rethrow/src/main/java/com/agorapulse/micronaut/rethrow/RethrowAsRuntimeException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../micronaut-rethrow/src/test/groovy/com/agorapulse/micronaut/rethrow/FailingClosure.groovy
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../micronaut-rethrow/src/test/groovy/com/agorapulse/micronaut/rethrow/FailingException.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.