Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class AppDetails {
private String name;
private int minSdk;
private int targetSdk;
private int maxSdk;
private List<String> permissions;
private String activity;
private String activityLayout;
Expand Down Expand Up @@ -50,6 +51,10 @@ public int getTargetSdk() {
return targetSdk;
}

public int getMaxSdk() {
return maxSdk;
}

public List<String> getPermissions() {
return permissions;
}
Expand Down Expand Up @@ -186,6 +191,9 @@ public String toString() {
", acra=" + acra + //
", eclipse=" + eclipse + //
", proguard=" + proguard + //
", minSdk=" + minSdk + //
", maxSdk=" + maxSdk + //
", targetSdk=" + targetSdk + //
"]";

}
Expand Down Expand Up @@ -226,6 +234,11 @@ public Builder targetSdk(int targetSdk) {
return this;
}

public Builder maxSdk(int maxSdk) {
state.maxSdk = maxSdk;
return this;
}

public Builder permissions(List<String> permissions) {
state.permissions = permissions;
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@

<uses-sdk
android:minSdkVersion="${application.minSdk}"
android:targetSdkVersion="${application.targetSdk}" />
android:targetSdkVersion="${application.targetSdk}"
android:maxSdkVersion="${application.maxSdk}" />

<#list application.permissions as permission>
<uses-permission android:name="${permission}" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
target=android-16
target=android-${application.targetSdk}
<#if application.actionBarSherlock>
android.library.reference.1=../actionbarsherlock
</#if>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public void before() {
activityLayout("activity_main").//
minSdk(8).//
targetSdk(16).//
maxSdk(17).
permissions(new ArrayList<String>());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ public void tearUp() {
activityLayout("activity_main").//
minSdk(8).//
targetSdk(16).//
maxSdk(17).
permissions(new ArrayList<String>());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,14 @@ public Response go(//
@FormParam("packageName") String packageName,//
@FormParam("name") String name,//
@FormParam("activity") String activity,//
@FormParam("activityLayout") String activityLayout//
@FormParam("activityLayout") String activityLayout,//

//sdk min target
@FormParam("sdkMinTarget") int sdkMinTarget,//
//sdk target
@FormParam("sdkTarget") int sdkTarget,//
//sdk max target
@FormParam("sdkMaxTarget") int sdkMaxTarget//
) {

boolean listNavigation = false;
Expand All @@ -67,6 +74,26 @@ public Response go(//
activityLayout = "activity_main";
}

if (sdkMinTarget<8 || sdkMinTarget>17) {
sdkMinTarget = 8;
}

if (sdkTarget<8 || sdkTarget>17) {
sdkTarget = 17;
}

if (sdkMinTarget > sdkTarget){
sdkMinTarget = 8;
sdkTarget = 17;
}

if(sdkMinTarget > sdkMaxTarget || sdkTarget > sdkMaxTarget) {
sdkMaxTarget=17;
sdkMinTarget=8;
sdkTarget=17;
}


if (viewPager && !actionBarSherlock && !viewPagerIndicator && !supportV4) {
supportV4 = true;
}
Expand All @@ -78,8 +105,9 @@ public Response go(//
name(name).//
activity(activity).//
activityLayout(activityLayout).//
minSdk(8).//
targetSdk(16).//
minSdk(sdkMinTarget).//
targetSdk(sdkTarget).//
maxSdk(sdkMaxTarget).//
permissions(new ArrayList<String>()).//

// Libraries
Expand All @@ -99,8 +127,8 @@ public Response go(//
proguard(proguard). //
build();

final Kickstartr kickstarter = new Kickstartr(appDetails);
final File file = kickstarter.start();
final Kickstartr kickStarter = new Kickstartr(appDetails);
final File file = kickStarter.start();

if (file == null) {
return Response.serverError().build();
Expand All @@ -110,7 +138,7 @@ public Response go(//
public void write(OutputStream output) throws IOException, WebApplicationException {
try {
FileUtils.copyFile(file, output);
kickstarter.clean();
kickStarter.clean();
} catch (Exception e) {
throw new WebApplicationException(e);
}
Expand Down
17 changes: 17 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<logback.version>1.0.0</logback.version>
<junit.version>4.10</junit.version>
<maven-invoker.version>2.0.11</maven-invoker.version>
<maven.compiler.plugin.version>3.0</maven.compiler.plugin.version>
<java.target.version>1.6</java.target.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -93,4 +95,19 @@
</dependencies>
</dependencyManagement>


<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven.compiler.plugin.version}</version>
<configuration>
<source>${java.target.version}</source>
<target>${java.target.version}</target>
</configuration>
</plugin>
</plugins>
</build>

</project>