|
45 | 45 |
|
46 | 46 | import com.android.build.api.variant.BuiltArtifacts; |
47 | 47 | import com.android.build.api.variant.BuiltArtifactsLoader; |
| 48 | +import com.google.gson.Gson; |
48 | 49 | import com.google.gson.GsonBuilder; |
49 | 50 |
|
50 | 51 | public abstract class BuildPluginTask extends DefaultTask { |
@@ -90,27 +91,25 @@ public void execute() { |
90 | 91 | } |
91 | 92 |
|
92 | 93 | BlockIdleSdkExtension ext = getProject().getExtensions().getByType(BlockIdleSdkExtension.class); |
| 94 | + File sdkMetadataFile = Utilities.extractSdkMetadata(getProject()); |
| 95 | + SdkMetadata sdkMetadata = Utilities.readSdkMetadata(sdkMetadataFile); |
93 | 96 |
|
94 | 97 | Map<String, Object> root = new LinkedHashMap<>(); |
95 | 98 |
|
96 | 99 | 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); |
97 | 107 | root.put("variant", getVariantName().get()); |
98 | 108 | root.put("buildType", getBuildType().get()); |
99 | 109 | root.put("flavors", getProductFlavors().get()); |
100 | 110 | root.put("appMinSdk", getAppMinSdk().get()); |
101 | 111 | root.put("appTargetSdk", getAppTargetSdk().get()); |
102 | 112 |
|
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 | | - |
114 | 113 | List<Map<String, Object>> outputs = new ArrayList<>(); |
115 | 114 |
|
116 | 115 | builtArtifacts.getElements().forEach(artifact -> { |
|
0 commit comments