Skip to content

Commit d17a497

Browse files
Increase target version and remove deprecated API calls
1 parent 06af053 commit d17a497

File tree

8 files changed

+17
-23
lines changed

8 files changed

+17
-23
lines changed

HelpStackExample/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<uses-sdk
99
android:minSdkVersion="8"
10-
android:targetSdkVersion="19" />
10+
android:targetSdkVersion="22" />
1111

1212
<uses-permission android:name="android.permission.INTERNET"/>
1313

HelpStackExample/build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,12 @@ dependencies {
44
compile fileTree(dir: 'libs', include: '*.jar')
55
compile project(':helpstack')
66

7-
compile ('com.android.support:appcompat-v7:19.1.0') {
8-
force = true
9-
}
7+
compile 'com.android.support:appcompat-v7:22.2.0'
108
}
119

1210
android {
13-
compileSdkVersion 19
14-
buildToolsVersion "19.1.0"
11+
compileSdkVersion 22
12+
buildToolsVersion "22.0.1"
1513

1614
sourceSets {
1715
main {

HelpStackExample/src/com/example/helpstackexample/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.os.Bundle;
44
import android.support.v4.app.Fragment;
5-
import android.support.v7.app.ActionBarActivity;
5+
import android.support.v7.app.AppCompatActivity;
66
import android.view.LayoutInflater;
77
import android.view.Menu;
88
import android.view.MenuItem;
@@ -13,7 +13,7 @@
1313
import com.crashlytics.android.Crashlytics;
1414
import com.tenmiles.helpstack.HSHelpStack;
1515

16-
public class MainActivity extends ActionBarActivity {
16+
public class MainActivity extends AppCompatActivity {
1717

1818
@Override
1919
protected void onCreate(Bundle savedInstanceState) {

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:1.1.2'
7+
classpath 'com.android.tools.build:gradle:1.2.3'
88
}
99
}
1010

helpstack/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<uses-sdk
88
android:minSdkVersion="8"
9-
android:targetSdkVersion="19" />
9+
android:targetSdkVersion="22" />
1010

1111
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
1212
<uses-permission android:name="android.permission.INTERNET" />

helpstack/build.gradle

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@ apply plugin: 'maven'
44
dependencies {
55
compile fileTree(dir: 'libs', include: '*.jar')
66

7-
compile ('com.android.support:appcompat-v7:19.1.0') {
8-
force = true
9-
}
7+
compile 'com.android.support:appcompat-v7:22.2.0'
108

11-
compile ('com.google.code.gson:gson:2.2.4') {
12-
force = true
13-
}
9+
compile 'com.google.code.gson:gson:2.3'
1410

1511
compile 'org.apache.httpcomponents:httpmime:4.2.6'
1612
compile 'com.mcxiaoke.volley:library:1.0.5'
1713
}
1814

1915
android {
20-
compileSdkVersion 19
21-
buildToolsVersion "19.1.0"
16+
compileSdkVersion 22
17+
buildToolsVersion "22.0.1"
2218

2319
sourceSets {
2420
main {
@@ -49,7 +45,7 @@ uploadArchives {
4945
repositories.mavenDeployer {
5046
pom.groupId = 'com.tenmiles'
5147
pom.artifactId = 'helpstack'
52-
pom.version = '1.1.2'
48+
pom.version = '1.1.3'
5349
// Add other pom properties here if you want (developer details / licenses)
5450
repository(url: "file:///Users/anirudh/Desktop/gradleRelease/")
5551
}

helpstack/src/com/tenmiles/helpstack/activities/EditAttachmentActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import android.os.Build;
3434
import android.os.Bundle;
3535
import android.provider.MediaStore;
36-
import android.support.v7.app.ActionBarActivity;
36+
import android.support.v7.app.AppCompatActivity;
3737
import android.view.Menu;
3838
import android.view.MenuInflater;
3939
import android.view.MenuItem;
@@ -48,7 +48,7 @@
4848
import java.io.FileNotFoundException;
4949
import java.util.UUID;
5050

51-
public class EditAttachmentActivity extends ActionBarActivity {
51+
public class EditAttachmentActivity extends AppCompatActivity {
5252

5353
private final int REQUEST_CODE_PHOTO_PICKER = 100;
5454

helpstack/src/com/tenmiles/helpstack/activities/HSActivityParent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
import android.os.Bundle;
2828
import android.support.v7.app.ActionBar;
29-
import android.support.v7.app.ActionBarActivity;
29+
import android.support.v7.app.AppCompatActivity;
3030
import android.view.Window;
3131

3232
/**
@@ -35,7 +35,7 @@
3535
* @author Nalin Chhajer
3636
*
3737
*/
38-
public class HSActivityParent extends ActionBarActivity {
38+
public class HSActivityParent extends AppCompatActivity {
3939

4040
@Override
4141
protected void onCreate(Bundle savedInstanceState) {

0 commit comments

Comments
 (0)