Skip to content

Commit ed7aeae

Browse files
committed
Cleaned the whole thing up
1 parent a8e8cd5 commit ed7aeae

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

.settings/org.eclipse.buildship.core.prefs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
55
connection.project.dir=
66
eclipse.preferences.version=1
77
gradle.user.home=
8-
java.home=
8+
java.home=C\:/Program Files (x86)/Common Files/Oracle/Java
99
jvm.arguments=
1010
offline.mode=false
1111
override.workspace.settings=true

src/main/java/io/github/intisy/gradle/github/GithubExtension.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package io.github.intisy.gradle.github;
22

3-
import java.util.List;
4-
3+
@SuppressWarnings("unused")
54
public class GithubExtension {
65
private String accessToken;
76
private boolean debug;

src/main/java/io/github/intisy/gradle/github/Main.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,14 @@ public void apply(Project project) {
4343
task.setGroup("github");
4444
task.setDescription("Updates all GitHub dependencies");
4545
task.doLast(t -> {
46-
logger.debug("Updating all GitHub dependencies");
4746
boolean refresh = false;
4847
Set<Dependency> dependencyList = new HashSet<>();
4948
project.getAllprojects().forEach(p -> {
5049
if (!p.equals(project.getRootProject())) {
5150
dependencyList.addAll(p.getConfigurations().getByName("githubImplementation").getAllDependencies());
5251
}
5352
});
54-
53+
logger.debug("Updating GitHub dependencies: " + dependencyList);
5554
for (Dependency dependency : dependencyList) {
5655
String group = dependency.getGroup();
5756
String name = dependency.getName();
@@ -63,7 +62,7 @@ public void apply(Project project) {
6362
Gradle.modifyBuildFile(project, group + ":" + name + ":" + version, group + ":" + name + ":" + newVersion);
6463
refresh = true;
6564
} else {
66-
logger.log("Dependency " + group + "/" + name + " is already up to date (" + version + " -> " + newVersion + ")");
65+
logger.log("Dependency " + group + "/" + name + " is already up to date");
6766
}
6867
}
6968
if (refresh)

src/main/java/io/github/intisy/gradle/github/impl/GitHub.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public class GitHub {
3636
*/
3737
public static File getAsset(Logger logger, String repoName, String repoOwner, String version, org.kohsuke.github.GitHub github) {
3838
File direction = new File(GradleUtils.getGradleHome().toFile(), repoOwner);
39-
direction.mkdirs();
39+
if (!direction.mkdirs())
40+
throw new RuntimeException("Failed to create directory: " + direction.getAbsolutePath());
4041
File jar = new File(direction, repoName + "-" + version + ".jar");
4142
logger.debug("Starting the process to implement jar: " + jar.getName());
4243
if (!jar.exists()) {
@@ -48,7 +49,7 @@ public static File getAsset(Logger logger, String repoName, String repoOwner, St
4849
targetRelease = release;
4950
}
5051
if (targetRelease != null) {
51-
List<GHAsset> assets = targetRelease.getAssets();
52+
List<GHAsset> assets = targetRelease.listAssets().toList();
5253
if (!assets.isEmpty()) {
5354
for (GHAsset asset : assets) {
5455
if (asset.getName().equals(repoName + ".jar")) {
@@ -66,8 +67,10 @@ public static File getAsset(Logger logger, String repoName, String repoOwner, St
6667
throw new RuntimeException("Github exception while pulling asset: " + e.getMessage() + " (retrying in 5 seconds...)");
6768
}
6869
throw new RuntimeException("Could not find an valid asset for " + repoOwner + ":" + repoName);
69-
} else
70+
} else {
71+
logger.debug("Jar already exists: " + jar.getName());
7072
return jar;
73+
}
7174
}
7275
/**
7376
* Downloads the asset.
@@ -90,12 +93,12 @@ public static void download(Logger logger, File direction, GHAsset asset, String
9093
if (!response.isSuccessful()) {
9194
response.close();
9295
throw new IOException("Failed to download asset: " + response);
93-
} else {
96+
} else if (response.body() != null) {
9497
byte[] bytes = response.body().bytes();
9598
try (FileOutputStream fos = new FileOutputStream(direction)) {
9699
fos.write(bytes);
97100
} catch (IOException e) {
98-
e.printStackTrace();
101+
throw new RuntimeException(e);
99102
}
100103
}
101104
logger.log("Download completed for dependency " + repoOwner + "/" + repoName);
@@ -111,7 +114,7 @@ public static GHRelease getLatestRelease(Logger logger, String repoOwner, String
111114
} else
112115
throw new RuntimeException("No releases found for " + repoName);
113116
} catch (IOException e) {
114-
System.err.println("Error fetching releases: " + e.getMessage());
117+
logger.error("Error fetching releases: " + e.getMessage());
115118
throw new RuntimeException(e);
116119
}
117120
}

src/main/java/io/github/intisy/gradle/github/impl/Gradle.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,15 @@ public static void safeSoftRefreshGradle(Project project) {
3131
Logger logger = new Logger(project);
3232
logger.log("Attempting safe configuration refresh...");
3333
project.getConfigurations().forEach(config -> {
34-
if (config.isCanBeResolved()) { // Only touch resolvable configs
34+
if (config.isCanBeResolved()) {
3535
config.setTransitive(false);
36-
config.setTransitive(true); // Toggle to invalidate cache
36+
config.setTransitive(true);
3737
}
3838
});
3939
resolveIfPossible(project, "compileClasspath");
4040
resolveIfPossible(project, "runtimeClasspath");
4141
resolveIfPossible(project, "testRuntimeClasspath");
42-
project.getLogger().lifecycle(
43-
"For full refresh, run with: --refresh-dependencies --recompile-scripts"
44-
);
42+
logger.log("For full refresh, run with: --refresh-dependencies --recompile-scripts");
4543
}
4644

4745
private static void resolveIfPossible(Project project, String configName) {

0 commit comments

Comments
 (0)