diff --git a/app/build.gradle b/app/build.gradle index f4cce14..dec1d3e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,15 +1,14 @@ apply plugin: 'com.android.application' -apply plugin: 'com.neenbedankt.android-apt' android { compileSdkVersion 25 - buildToolsVersion '25.0.0' + buildToolsVersion '26.0.2' defaultConfig { applicationId "com.eleith.calchoochoo" minSdkVersion 22 targetSdkVersion 25 - versionCode 15 - versionName "1.15" + versionCode 17 + versionName "1.17" resValue "string", "GOOGLE_MAPS_API_KEY", GOOGLE_MAPS_API_KEY } buildTypes { @@ -43,17 +42,17 @@ dependencies { compile 'io.reactivex:rxandroid:1.2.0' compile 'io.reactivex:rxjava:1.1.4' //dagger2 (dependency injection) - apt 'com.google.dagger:dagger-compiler:2.7' + annotationProcessor 'com.google.dagger:dagger-compiler:2.7' compile 'com.google.dagger:dagger:2.7' provided 'javax.annotation:jsr250-api:1.0' //butterknife (view injection) compile 'com.jakewharton:butterknife:8.4.0' - apt 'com.jakewharton:butterknife-compiler:8.4.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:8.4.0' // sqliteasset helper compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1' //Parceler compile 'org.parceler:parceler-api:1.1.9' - apt 'org.parceler:parceler:1.1.9' + annotationProcessor 'org.parceler:parceler:1.1.9' // chrome custom tabs compile 'com.android.support:customtabs:25.3.1' } diff --git a/app/src/main/assets/databases/caltrain-10.01.2017.db b/app/src/main/assets/databases/caltrain-10.01.2017.db new file mode 100644 index 0000000..1652ef3 Binary files /dev/null and b/app/src/main/assets/databases/caltrain-10.01.2017.db differ diff --git a/app/src/main/java/com/eleith/calchoochoo/data/ChooChooDatabase.java b/app/src/main/java/com/eleith/calchoochoo/data/ChooChooDatabase.java index 858d269..9b06b33 100644 --- a/app/src/main/java/com/eleith/calchoochoo/data/ChooChooDatabase.java +++ b/app/src/main/java/com/eleith/calchoochoo/data/ChooChooDatabase.java @@ -6,8 +6,8 @@ import com.readystatesoftware.sqliteasset.SQLiteAssetHelper; public class ChooChooDatabase extends SQLiteAssetHelper { - private static final String DATABASE_NAME = "caltrain2.db"; - private static final int DATABASE_VERSION = 2; + private static final String DATABASE_NAME = "caltrain-10.01.2017.db"; + private static final int DATABASE_VERSION = 4; public ChooChooDatabase(Context context) { super(context, DATABASE_NAME, null, DATABASE_VERSION); diff --git a/build.gradle b/build.gradle index b37b2c7..0f9bb9b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 58418e7..fd2fb8e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 04 08:34:27 PST 2017 +#Sun Nov 12 15:28:46 PST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip