Skip to content

Update plugin and support library #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moskvax wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update plugin and support library #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c92a0
update gradle plugin and build tools to latest version
moskvax Apr 29, 2015
5fe146f
use new AppCompatActivity instead of ActionBarActivity
moskvax Apr 29, 2015
445e05c
latest gradle plugin is actually 1.2.2
moskvax Apr 29, 2015
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
10 changes: 5 additions & 5 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@ apply plugin: 'com.android.application'
apply plugin: 'idea'

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"
compileSdkVersion 22
buildToolsVersion "22.0.1"

defaultConfig {
applicationId "io.vtm.mapapp"
minSdkVersion 10
targetSdkVersion 21
targetSdkVersion 22
versionCode 1
versionName "1.0"
}
buildTypes {
release {
runProguard false
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
Expand All @@ -27,7 +27,7 @@ idea {
}
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.0'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'org.oscim:vtm:0.6.0-SNAPSHOT'
compile 'org.oscim:vtm-themes:0.6.0-SNAPSHOT'
compile 'org.oscim:vtm-android:0.6.0-SNAPSHOT@aar'
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/vtm/mapapp/MapActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.vtm.mapapp;

import android.support.v7.app.ActionBarActivity;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;

Expand All @@ -17,7 +17,7 @@
import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;


public class MapActivity extends ActionBarActivity {
public class MapActivity extends AppCompatActivity {

private MapView mMapView;
private Map mMap;
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:0.13.2'
classpath 'com.android.tools.build:gradle:1.2.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Nov 19 19:34:47 CET 2014
#Wed Apr 29 09:11:30 AEST 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip