Skip to content

Commit e085078

Browse files
committed
Save sdk target version to manifest
1 parent 7105ff0 commit e085078

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

src/processing/mode/android/AndroidBuild.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,12 @@ public AndroidBuild(final Sketch sketch, final AndroidMode mode) {
6767
coreZipFile = mode.getCoreZipLocation();
6868
}
6969

70-
public static void setSdkTarget(AndroidSDK.SDKTarget target) {
70+
public static void setSdkTarget(AndroidSDK.SDKTarget target, Sketch sketch) {
7171
sdkName = target.name;
7272
sdkVersion = Integer.toString(target.version);
73+
74+
Manifest manifest = new Manifest(sketch);
75+
manifest.setSdkTarget(sdkVersion);
7376
}
7477

7578
/**

src/processing/mode/android/AndroidEditor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public void stateChanged(ChangeEvent e) {
303303
item.addActionListener(new ActionListener() {
304304
@Override
305305
public void actionPerformed(ActionEvent e) {
306-
AndroidBuild.setSdkTarget(target);
306+
AndroidBuild.setSdkTarget(target, sketch);
307307

308308
for (int i = 0; i < sdkMenu.getItemCount(); i++) {
309309
((JCheckBoxMenuItem) sdkMenu.getItem(i)).setState(false);
@@ -316,7 +316,7 @@ public void actionPerformed(ActionEvent e) {
316316
sdkMenu.add(item);
317317
}
318318

319-
AndroidBuild.setSdkTarget(lowestTargetAvailable);
319+
AndroidBuild.setSdkTarget(lowestTargetAvailable, sketch);
320320
lowestTargetMenuItem.setState(true);
321321
} catch (IOException e) {
322322
e.printStackTrace();

src/processing/mode/android/Manifest.java

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,18 @@
2121

2222
package processing.mode.android;
2323

24+
import org.xml.sax.SAXException;
25+
import processing.app.Base;
26+
import processing.app.Sketch;
27+
import processing.core.PApplet;
28+
import processing.data.XML;
29+
30+
import javax.xml.parsers.ParserConfigurationException;
2431
import java.io.File;
2532
import java.io.FileNotFoundException;
2633
import java.io.IOException;
2734
import java.io.PrintWriter;
2835

29-
import javax.xml.parsers.ParserConfigurationException;
30-
31-
import org.xml.sax.SAXException;
32-
33-
import processing.app.*;
34-
import processing.core.PApplet;
35-
import processing.data.XML;
36-
3736

3837
public class Manifest {
3938
static final String MANIFEST_XML = "AndroidManifest.xml";
@@ -90,6 +89,11 @@ public void setPackageName(String packageName) {
9089
save();
9190
}
9291

92+
public void setSdkTarget(String version) {
93+
XML usesSdk = xml.getChild("uses-sdk");
94+
usesSdk.setString("android:minSdkVersion", version);
95+
save();
96+
}
9397

9498
//writer.println(" <uses-permission android:name=\"android.permission.INTERNET\" />");
9599
//writer.println(" <uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />");

0 commit comments

Comments
 (0)