Skip to content

Commit 8cc834e

Browse files
committed
chore: pack sdk info as separate json object
1 parent 5fb59ca commit 8cc834e

1 file changed

Lines changed: 10 additions & 11 deletions

File tree

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

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
import com.android.build.api.variant.BuiltArtifacts;
4747
import com.android.build.api.variant.BuiltArtifactsLoader;
48+
import com.google.gson.Gson;
4849
import com.google.gson.GsonBuilder;
4950

5051
public abstract class BuildPluginTask extends DefaultTask {
@@ -90,27 +91,25 @@ public void execute() {
9091
}
9192

9293
BlockIdleSdkExtension ext = getProject().getExtensions().getByType(BlockIdleSdkExtension.class);
94+
File sdkMetadataFile = Utilities.extractSdkMetadata(getProject());
95+
SdkMetadata sdkMetadata = Utilities.readSdkMetadata(sdkMetadataFile);
9396

9497
Map<String, Object> root = new LinkedHashMap<>();
9598

9699
root.put("pluginName", ext.getPluginName().get());
100+
101+
Gson gson = new Gson();
102+
@SuppressWarnings("unchecked")
103+
Map<String, Object> sdkMap = gson.fromJson(gson.toJson(sdkMetadata), Map.class);
104+
sdkMap.put("minSdk", ext.getMinSdkVersion().get());
105+
106+
root.put("sdk", sdkMap);
97107
root.put("variant", getVariantName().get());
98108
root.put("buildType", getBuildType().get());
99109
root.put("flavors", getProductFlavors().get());
100110
root.put("appMinSdk", getAppMinSdk().get());
101111
root.put("appTargetSdk", getAppTargetSdk().get());
102112

103-
File sdkMetadataFile = Utilities.extractSdkMetadata(getProject());
104-
SdkMetadata sdkMetadata = Utilities.readSdkMetadata(sdkMetadataFile);
105-
106-
root.put("minSdk", ext.getMinSdkVersion().get());
107-
root.put("minSdkSupported", sdkMetadata.minSdkSupported);
108-
root.put("sdkVersion", sdkMetadata.version);
109-
root.put("sdkVersionNumber", sdkMetadata.versionNumber);
110-
root.put("sdkSubVersionType", sdkMetadata.versionType);
111-
root.put("sdkSubVersionNumber", sdkMetadata.subVersion);
112-
root.put("sdkVersionName", sdkMetadata.versionName);
113-
114113
List<Map<String, Object>> outputs = new ArrayList<>();
115114

116115
builtArtifacts.getElements().forEach(artifact -> {

0 commit comments

Comments
 (0)