Skip to content

Commit 741964f

Browse files
committed
Update to sdk 17 and fix a bug so that source can build in Android Studio.
1 parent 5e02afa commit 741964f

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package com.donnfelker.android.bootstrap.core;
2+
3+
public class IntentFactory {
4+
}

app/src/main/java/com/donnfelker/android/bootstrap/ui/AlternatingColorListAdapter.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import android.view.LayoutInflater;
55

6-
import com.actionbarsherlock.R.color;
6+
import com.donnfelker.android.bootstrap.R;
77
import com.github.kevinsawicki.wishlist.SingleTypeAdapter;
88
import com.donnfelker.android.bootstrap.R.drawable;
99

@@ -49,8 +49,8 @@ public AlternatingColorListAdapter(final int layoutId,
4949
primaryResource = drawable.table_background_selector;
5050
secondaryResource = drawable.table_background_alternate_selector;
5151
} else {
52-
primaryResource = color.pager_background;
53-
secondaryResource = color.pager_background_alternate;
52+
primaryResource = R.color.pager_background;
53+
secondaryResource = R.color.pager_background_alternate;
5454
}
5555

5656
setItems(items);

integration-tests/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="140" android:versionName="1.4-SNAPSHOT" package="com.donnfelker.android.bootstrap.tests">
33
<!-- Note: This file will be auto-formatted by the build (specifically android:manifest-update goal) -->
44

5-
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
5+
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17"/>
66

77
<application android:debuggable="true">
88
<uses-library android:name="android.test.runner"/>

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545

4646
<properties>
4747
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
48-
<android.version>4.1.1.4</android.version>
48+
<android.version>4.2.2</android.version>
4949
<maven.resources.version>2.6</maven.resources.version>
5050
</properties>
5151
<build>
@@ -58,7 +58,7 @@
5858
<extensions>true</extensions>
5959
<configuration>
6060
<sdk>
61-
<platform>16</platform>
61+
<platform>17</platform>
6262
</sdk>
6363
<!--<undeployBeforeDeploy>true</undeployBeforeDeploy>-->
6464
<proguard>

0 commit comments

Comments
 (0)