Skip to content

Commit 2cd816b

Browse files
authored
Merge pull request #12 from ergon/bugfix/gradle_classloader
Use local class loader to find the required classes also in gradle
2 parents a44c74f + 5923c83 commit 2cd816b

File tree

4 files changed

+16
-4
lines changed

4 files changed

+16
-4
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ out/
44
build/
55
/integration-test-db/src/main/resources/adamd/target_version
66
gradle-plugin-test/.gradle/
7+
gradle-plugin-test/gradle/
8+
gradle-plugin-test/gradlew*
79
gradle.properties
810
local.properties

core/src/main/java/ch/ergon/adam/core/reflection/ReflectionHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class ReflectionHelper {
1616
private static Set<Class<?>> findAllClassesForPackage(String packageName) {
1717
if (!classesByPackageCache.containsKey(packageName)) {
1818
try {
19-
Set<Class<?>> classes = ClassPath.from(ClassLoader.getSystemClassLoader()).getAllClasses()
19+
Set<Class<?>> classes = ClassPath.from(ReflectionHelper.class.getClassLoader()).getAllClasses()
2020
.stream()
2121
.filter(c -> c.getPackageName().startsWith(packageName))
2222
.map(ClassPath.ClassInfo::getName)

gradle-plugin-test/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ buildscript {
88
}
99

1010
dependencies {
11-
classpath 'ch.ergon.adam:postgresql:1.0.0'
12-
classpath 'ch.ergon.adam:yml:1.0.0'
11+
classpath 'ch.ergon.adam:postgresql:1.2.2'
12+
classpath 'ch.ergon.adam:yml:1.2.2'
1313
}
1414
}
1515

1616
plugins {
1717
id 'java'
18-
id 'ch.ergon.adam' version '1.0.0'
18+
id 'ch.ergon.adam' version '1.2.2'
1919
}
2020

2121
adam {

gradle-plugin-test/settings.gradle

+10
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1+
pluginManagement {
2+
repositories {
3+
gradlePluginPortal()
4+
maven {
5+
name = "localPluginRepository"
6+
url = uri("/tmp/adam/local-gradle-plugin-repository")
7+
}
8+
}
9+
}
10+
111
rootProject.name = 'adam-gradleplugin-test'

0 commit comments

Comments
 (0)