Skip to content

Commit b6b6fd7

Browse files
DevVigilanteDevVigilante
committed
style: format all source code
1 parent 74c022f commit b6b6fd7

7 files changed

Lines changed: 143 additions & 155 deletions

File tree

‎plugin/build.gradle‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@ plugins {
2121
}
2222

2323
mavenPublishing {
24-
publishToMavenCentral()
25-
signAllPublications()
24+
publishToMavenCentral()
25+
signAllPublications()
2626
}
2727

2828
signing {
29-
useInMemoryPgpKeys(
30-
findProperty("signingInMemoryKey"),
31-
findProperty("signingInMemoryKeyPassword")
32-
)
29+
String key = findProperty("signingInMemoryKey")
30+
String password = findProperty("signingInMemoryKeyPassword")
31+
useInMemoryPgpKeys(key, password)
3332
}
3433

3534
group = "io.github.devvigilante"
@@ -61,9 +60,9 @@ dependencies {
6160
}
6261

6362
mavenPublishing {
64-
coordinates(group, "blockidle-gradle-plugin-builder", version)
65-
66-
pom {
63+
coordinates(group, "blockidle-gradle-plugin-builder", version)
64+
65+
pom {
6766
name.set("BlockIDLE Gradle Plugin Builder")
6867
description.set("Plugin for developing BlockIDLE plugins")
6968
url.set("https://github.com/Innovative-CST/BlockIDLE")
@@ -88,5 +87,5 @@ mavenPublishing {
8887
connection.set("scm:git:https://github.com/Innovative-CST/BlockIDLE.git")
8988
developerConnection.set("scm:git:ssh://git@github.com/Innovative-CST/BlockIDLE.git")
9089
}
91-
}
90+
}
9291
}

‎plugin/src/main/java/com/icst/plugin/builder/ApplyPlugin.java‎

Lines changed: 29 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,19 @@
1717

1818
package com.icst.plugin.builder;
1919

20-
import java.io.File;
21-
import java.io.InputStream;
22-
import java.io.OutputStream;
23-
import java.net.URL;
24-
import java.nio.file.Files;
2520
import java.util.ArrayList;
2621
import java.util.HashMap;
2722
import java.util.Map;
2823

2924
import org.gradle.api.GradleException;
3025
import org.gradle.api.Plugin;
3126
import org.gradle.api.Project;
27+
import org.gradle.api.artifacts.Configuration;
3228

3329
import com.android.build.api.artifact.SingleArtifact;
3430
import com.android.build.api.variant.AndroidComponentsExtension;
3531
import com.android.build.api.variant.Variant;
3632
import com.android.build.gradle.AppExtension;
37-
import org.gradle.api.artifacts.Configuration;
3833

3934
public class ApplyPlugin implements Plugin<Project> {
4035

@@ -58,32 +53,30 @@ public void apply(Project project) {
5853
}
5954

6055
private void configure(Project project, AppExtension androidExt) {
61-
BlockIdleSdkExtension ext = project.getExtensions().getByType(BlockIdleSdkExtension.class);
62-
63-
Configuration sdkCfg = project.getConfigurations().maybeCreate("blockIdlePluginSdk");
64-
sdkCfg.setCanBeResolved(true);
65-
sdkCfg.setCanBeConsumed(false);
66-
67-
project.afterEvaluate(t -> {
68-
if (!ext.getPluginName().isPresent()) {
69-
throw new GradleException("Please provide a plugin name");
70-
}
71-
if (!ext.getSdkVersion().isPresent()) {
72-
throw new GradleException("Please provide sdk version for building plugin for BlockIDLE");
73-
}
74-
75-
String sdkVersion = ext.getSdkVersion().get();
76-
77-
project.getDependencies().add(
78-
"blockIdlePluginSdk",
79-
"io.github.devvigilante:blockidle-plugin-sdk:" + sdkVersion
80-
);
81-
82-
project.getDependencies().add(
83-
"compileOnly",
84-
"io.github.devvigilante:blockidle-plugin-sdk:" + sdkVersion
85-
);
86-
});
56+
BlockIdleSdkExtension ext = project.getExtensions().getByType(BlockIdleSdkExtension.class);
57+
58+
Configuration sdkCfg = project.getConfigurations().maybeCreate("blockIdlePluginSdk");
59+
sdkCfg.setCanBeResolved(true);
60+
sdkCfg.setCanBeConsumed(false);
61+
62+
project.afterEvaluate(t -> {
63+
if (!ext.getPluginName().isPresent()) {
64+
throw new GradleException("Please provide a plugin name");
65+
}
66+
if (!ext.getSdkVersion().isPresent()) {
67+
throw new GradleException("Please provide sdk version for building plugin for BlockIDLE");
68+
}
69+
70+
String sdkVersion = ext.getSdkVersion().get();
71+
72+
project.getDependencies().add(
73+
"blockIdlePluginSdk",
74+
"io.github.devvigilante:blockidle-plugin-sdk:" + sdkVersion);
75+
76+
project.getDependencies().add(
77+
"compileOnly",
78+
"io.github.devvigilante:blockidle-plugin-sdk:" + sdkVersion);
79+
});
8780

8881
project.getTasks().register("buildPlugin", task -> {
8982
task.setGroup("block-idle");
@@ -92,11 +85,9 @@ private void configure(Project project, AppExtension androidExt) {
9285

9386
project.getTasks().register("mergePluginMetadata", MergePluginMetadataTask.class, t -> {
9487
t.getInputDir().set(
95-
project.getLayout().getBuildDirectory().dir("outputs/plugin")
96-
);
88+
project.getLayout().getBuildDirectory().dir("outputs/plugin"));
9789
t.getOutputFile().set(
98-
project.getLayout().getBuildDirectory().file("outputs/plugin/plugin-metadata.json")
99-
);
90+
project.getLayout().getBuildDirectory().file("outputs/plugin/plugin-metadata.json"));
10091
});
10192
project.getTasks().named("buildPlugin").configure(t -> t.dependsOn("mergePluginMetadata"));
10293

@@ -136,12 +127,12 @@ private void configure(Project project, AppExtension androidExt) {
136127

137128
task.getProductFlavors().set(flavors);
138129
task.getMinSdk().set(ext.getMinSdkVersion());
139-
task.getAppMinSdk().set(minSdk);
130+
task.getAppMinSdk().set(minSdk);
140131
task.getAppTargetSdk().set(targetSdk);
141132
task.getMetadataFile().set(
142133
project.getLayout().getBuildDirectory().file(
143134
"outputs/plugin/" + variant.getName() + "/plugin-metadata.json"));
144-
task.getPluginOutputDir().set(
135+
task.getPluginOutputDir().set(
145136
project.getLayout().getBuildDirectory().file(
146137
"outputs/plugin/" + variant.getName()));
147138
});

‎plugin/src/main/java/com/icst/plugin/builder/BlockIdleSdkExtension.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
public abstract class BlockIdleSdkExtension {
2626

2727
public abstract Property<String> getPluginName();
28-
29-
public abstract Property<String> getSdkVersion();
30-
31-
public abstract Property<String> getMinSdkVersion();
28+
29+
public abstract Property<String> getSdkVersion();
30+
31+
public abstract Property<String> getMinSdkVersion();
3232

3333
@Inject
34-
public BlockIdleSdkExtension(ObjectFactory objects) {}
34+
public BlockIdleSdkExtension(ObjectFactory objects) {
35+
}
3536
}

‎plugin/src/main/java/com/icst/plugin/builder/BuildPluginTask.java‎

Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import java.io.IOException;
2323
import java.io.OutputStreamWriter;
2424
import java.io.Writer;
25-
import java.nio.file.Files;
2625
import java.nio.charset.StandardCharsets;
26+
import java.nio.file.Files;
2727
import java.util.ArrayList;
2828
import java.util.LinkedHashMap;
2929
import java.util.List;
@@ -70,14 +70,14 @@ public abstract class BuildPluginTask extends DefaultTask {
7070

7171
@Input
7272
public abstract Property<Integer> getAppTargetSdk();
73-
74-
@Input
73+
74+
@Input
7575
public abstract Property<Integer> getAppMinSdk();
7676

7777
@OutputFile
7878
public abstract RegularFileProperty getMetadataFile();
79-
80-
@OutputDirectory
79+
80+
@OutputDirectory
8181
public abstract RegularFileProperty getPluginOutputDir();
8282

8383
@TaskAction
@@ -93,52 +93,51 @@ public void execute() {
9393
getLogger().lifecycle("Flavors : " + getProductFlavors().get());
9494
getLogger().lifecycle("minSdk : " + getMinSdk().get());
9595
getLogger().lifecycle("targetSdk : " + getAppTargetSdk().get());
96-
97-
BlockIdleSdkExtension ext = getProject().getExtensions().getByType(BlockIdleSdkExtension.class);
96+
97+
BlockIdleSdkExtension ext = getProject().getExtensions().getByType(BlockIdleSdkExtension.class);
9898

9999
Map<String, Object> root = new LinkedHashMap<>();
100-
101-
root.put("pluginName", ext.getPluginName().get());
100+
101+
root.put("pluginName", ext.getPluginName().get());
102102
root.put("variant", getVariantName().get());
103103
root.put("buildType", getBuildType().get());
104104
root.put("flavors", getProductFlavors().get());
105105
root.put("appMinSdk", getAppMinSdk().get());
106106
root.put("appTargetSdk", getAppTargetSdk().get());
107-
108-
File sdkMetadataFile = Utilities.extractSdkMetadata(getProject());
109-
SdkMetadata sdkMetadata = Utilities.readSdkMetadata(sdkMetadataFile);
110-
111-
root.put("minSdk", ext.getMinSdkVersion().get());
112-
root.put("minSdkSupported", sdkMetadata.minSdkSupported);
113-
root.put("sdkVersion", sdkMetadata.version);
114-
root.put("sdkVersionNumber", sdkMetadata.versionNumber);
115-
root.put("sdkSubVersionType", sdkMetadata.versionType);
116-
root.put("sdkSubVersionNumber", sdkMetadata.subVersion);
117-
root.put("sdkVersionName", sdkMetadata.versionName);
107+
108+
File sdkMetadataFile = Utilities.extractSdkMetadata(getProject());
109+
SdkMetadata sdkMetadata = Utilities.readSdkMetadata(sdkMetadataFile);
110+
111+
root.put("minSdk", ext.getMinSdkVersion().get());
112+
root.put("minSdkSupported", sdkMetadata.minSdkSupported);
113+
root.put("sdkVersion", sdkMetadata.version);
114+
root.put("sdkVersionNumber", sdkMetadata.versionNumber);
115+
root.put("sdkSubVersionType", sdkMetadata.versionType);
116+
root.put("sdkSubVersionNumber", sdkMetadata.subVersion);
117+
root.put("sdkVersionName", sdkMetadata.versionName);
118118

119119
List<Map<String, Object>> outputs = new ArrayList<>();
120120

121121
builtArtifacts.getElements().forEach(artifact -> {
122-
try {
123-
File sourceApk = new File(artifact.getOutputFile());
124-
File targetApk = new File(getPluginOutputDir().get().getAsFile(), sourceApk.getName());
125-
126-
Files.copy(
127-
sourceApk.toPath(),
128-
targetApk.toPath(),
129-
java.nio.file.StandardCopyOption.REPLACE_EXISTING
130-
);
131-
132-
Map<String, Object> apk = new LinkedHashMap<>();
133-
apk.put("apkPath", targetApk.getName()); // RELATIVE PATH ✔
134-
apk.put("versionName", artifact.getVersionName());
135-
apk.put("filters", artifact.getFilters());
136-
137-
outputs.add(apk);
138-
139-
} catch (IOException e) {
140-
throw new GradleException("Failed to copy APK", e);
141-
}
122+
try {
123+
File sourceApk = new File(artifact.getOutputFile());
124+
File targetApk = new File(getPluginOutputDir().get().getAsFile(), sourceApk.getName());
125+
126+
Files.copy(
127+
sourceApk.toPath(),
128+
targetApk.toPath(),
129+
java.nio.file.StandardCopyOption.REPLACE_EXISTING);
130+
131+
Map<String, Object> apk = new LinkedHashMap<>();
132+
apk.put("apkPath", targetApk.getName()); // RELATIVE PATH ✔
133+
apk.put("versionName", artifact.getVersionName());
134+
apk.put("filters", artifact.getFilters());
135+
136+
outputs.add(apk);
137+
138+
} catch (IOException e) {
139+
throw new GradleException("Failed to copy APK", e);
140+
}
142141
});
143142

144143
root.put("outputs", outputs);

‎plugin/src/main/java/com/icst/plugin/builder/SdkMetadata.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@
1919

2020
public class SdkMetadata {
2121

22-
public String version;
23-
public String minSdkSupported;
22+
public String version;
23+
public String minSdkSupported;
2424

25-
public int versionNumber;
26-
public String versionType;
27-
public int subVersion;
28-
public String versionName;
25+
public int versionNumber;
26+
public String versionType;
27+
public int subVersion;
28+
public String versionName;
2929

30-
public int minApiLevel;
31-
public int javaVersion;
30+
public int minApiLevel;
31+
public int javaVersion;
3232
}

0 commit comments

Comments
 (0)