Update version to 3.26.0 (#88)

mikehardy · npurushe · commit 6388a4dc3abd · 2018-12-15T16:28:24.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 Change Log
 ==========
 
+## 3.26.0
+- [SQLite 3.26.0](http://sqlite.org/releaselog/3_26_0.html)
+- Update `org.apache.httpcomponents:httpclient` dependency to 4.5.6
+- Update `com.android.tools.build:gradle` dependency to 3.2.1
+- Update gradle to 4.10.2
+- Update `androidx.core:core` dependency to 1.0.1
+- Switch to androidx for test libraries
+
 ## 3.25.3
 
 - [SQLite 3.25.3](http://sqlite.org/releaselog/3_25_3.html)
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ Usage
 
 ```gradle
 dependencies {
-    implementation 'io.requery:sqlite-android:3.25.3'
+    implementation 'io.requery:sqlite-android:3.26.0'
 }
 ```
 Then change usages of `android.database.sqlite.SQLiteDatabase` to
diff --git a/build.gradle b/build.gradle
@@ -4,9 +4,9 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3'
-        classpath 'org.apache.httpcomponents:httpclient:4.5.3'
+        classpath 'org.apache.httpcomponents:httpclient:4.5.6'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Sep 22 20:39:18 ECT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip
diff --git a/sqlite-android/build.gradle b/sqlite-android/build.gradle
@@ -8,17 +8,16 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'de.undercouch.download'
 
 group = 'io.requery'
-version = '3.25.3'
+version = '3.26.0'
 description = 'Android SQLite compatibility library'
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "28.0.2"
 
     defaultConfig {
         minSdkVersion 14
         versionName project.version
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         consumerProguardFiles 'proguard-rules.pro'
         ndk {
             abiFilters 'armeabi-v7a','arm64-v8a','x86','x86_64'
@@ -46,16 +45,18 @@ android {
 
 dependencies {
     api 'androidx.sqlite:sqlite:2.0.0'
-    api 'androidx.core:core:1.0.0'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    api 'androidx.core:core:1.0.1'
+    androidTestImplementation 'androidx.test:core:1.0.0'
+    androidTestImplementation 'androidx.test:runner:1.1.0'
+    androidTestImplementation 'androidx.test:rules:1.1.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.0.0'
 }
 
 publish.dependsOn "assembleRelease"
 bintrayUpload.dependsOn "assembleRelease"
 
 ext {
-    sqliteDistributionUrl = 'http://sqlite.org/2018/sqlite-amalgamation-3250300.zip'
+    sqliteDistributionUrl = 'http://sqlite.org/2018/sqlite-amalgamation-3260000.zip'
     pomXml = {
         resolveStrategy = DELEGATE_FIRST
         name project.name
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/CursorWindowTest.java b/sqlite-android/src/androidTest/java/io/requery/android/database/CursorWindowTest.java
@@ -17,14 +17,14 @@
 
 package io.requery.android.database;
 
-import android.support.test.filters.SmallTest;
-import android.support.test.runner.AndroidJUnit4;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseCursorTest.java b/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseCursorTest.java
@@ -23,17 +23,17 @@
 import android.database.Cursor;
 import android.database.CursorIndexOutOfBoundsException;
 import android.os.Build;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
 import io.requery.android.database.sqlite.SQLiteCursor;
 import io.requery.android.database.sqlite.SQLiteCursorDriver;
 import io.requery.android.database.sqlite.SQLiteDatabase;
@@ -64,7 +64,7 @@ public class DatabaseCursorTest {
 
     @Before
     public void setUp() {
-        File dbDir = InstrumentationRegistry.getTargetContext().getDir("tests", Context.MODE_PRIVATE);
+        File dbDir = ApplicationProvider.getApplicationContext().getDir("tests", Context.MODE_PRIVATE);
         mDatabaseFile = new File(dbDir, "database_test.db");
 
         if (mDatabaseFile.exists()) {
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseErrorHandlerTest.java b/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseErrorHandlerTest.java
@@ -20,16 +20,16 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDiskIOException;
 import android.database.sqlite.SQLiteException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.Suppress;
 import io.requery.android.database.sqlite.SQLiteDatabase;
 
 import java.io.BufferedWriter;
@@ -55,7 +55,7 @@ public class DatabaseErrorHandlerTest {
 
     @Before
     public void setUp() {
-        dbDir = InstrumentationRegistry.getTargetContext().getDir(this.getClass().getName(), Context.MODE_PRIVATE);
+        dbDir = ApplicationProvider.getApplicationContext().getDir(this.getClass().getName(), Context.MODE_PRIVATE);
         mDatabaseFile = new File(dbDir, DB_NAME);
         if (mDatabaseFile.exists()) {
             mDatabaseFile.delete();
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseGeneralTest.java b/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseGeneralTest.java
@@ -24,12 +24,6 @@
 import android.database.DatabaseUtils;
 import android.database.sqlite.SQLiteException;
 import android.os.Parcel;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.LargeTest;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 import android.util.Pair;
 
@@ -46,6 +40,12 @@
 import java.util.List;
 import java.util.Locale;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
 import io.requery.android.database.sqlite.SQLiteDatabase;
 import io.requery.android.database.sqlite.SQLiteStatement;
 
@@ -72,7 +72,7 @@ public class DatabaseGeneralTest {
 
     @Before
     public void setUp() {
-        File dbDir = InstrumentationRegistry.getTargetContext().getDir(this.getClass().getName(), Context.MODE_PRIVATE);
+        File dbDir = ApplicationProvider.getApplicationContext().getDir(this.getClass().getName(), Context.MODE_PRIVATE);
         mDatabaseFile = new File(dbDir, "database_test.db");
         if (mDatabaseFile.exists()) {
             mDatabaseFile.delete();
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseLocaleTest.java b/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseLocaleTest.java
@@ -18,11 +18,12 @@
 package io.requery.android.database;
 
 import android.database.Cursor;
-import android.support.test.filters.MediumTest;
-import android.support.test.filters.SmallTest;
-import android.support.test.filters.Suppress;
-import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
 import io.requery.android.database.sqlite.SQLiteDatabase;
 
 import org.junit.After;
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseStatementTest.java b/sqlite-android/src/androidTest/java/io/requery/android/database/DatabaseStatementTest.java
@@ -21,15 +21,15 @@
 import android.database.Cursor;
 import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteDoneException;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.filters.MediumTest;
-import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
 import io.requery.android.database.sqlite.SQLiteDatabase;
 import io.requery.android.database.sqlite.SQLiteStatement;
 
@@ -54,7 +54,7 @@ public class DatabaseStatementTest {
 
     @Before
     public void setUp() {
-        File dbDir = InstrumentationRegistry.getTargetContext().getDir("tests", Context.MODE_PRIVATE);
+        File dbDir = ApplicationProvider.getApplicationContext().getDir("tests", Context.MODE_PRIVATE);
         mDatabaseFile = new File(dbDir, "database_test.db");
 
         if (mDatabaseFile.exists()) {
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/NewDatabasePerformanceTestSuite.java b/sqlite-android/src/androidTest/java/io/requery/android/database/NewDatabasePerformanceTestSuite.java
@@ -17,12 +17,12 @@
 
 package io.requery.android.database;
 
-import android.support.test.runner.AndroidJUnit4;
-
 import junit.framework.TestSuite;
 import org.junit.Ignore;
 import org.junit.runner.RunWith;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 @Ignore
 @RunWith(AndroidJUnit4.class)
 public class NewDatabasePerformanceTestSuite extends TestSuite {
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/NewDatabasePerformanceTests.java b/sqlite-android/src/androidTest/java/io/requery/android/database/NewDatabasePerformanceTests.java
@@ -19,7 +19,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.ContentValues;
-import android.support.test.runner.AndroidJUnit4;
 
 import junit.framework.TestCase;
 
@@ -28,13 +27,10 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import java.io.File;
 import java.util.Random;
 
-import static org.junit.Assert.assertTrue;
-
 /**
  * Database Performance Tests
  * 
diff --git a/sqlite-android/src/androidTest/java/io/requery/android/database/benchmark/Benchmark.java b/sqlite-android/src/androidTest/java/io/requery/android/database/benchmark/Benchmark.java
@@ -22,8 +22,6 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteStatement;
 import android.provider.BaseColumns;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
 import android.util.Log;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,6 +30,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
 @RunWith(AndroidJUnit4.class)
 public class Benchmark {
 
@@ -48,7 +49,7 @@ public void runBenchmark() {
         Statistics requery = new Statistics();
         for (int i = 0; i < runs; i++) {
 
-            Context context = InstrumentationRegistry.getContext();
+            Context context = ApplicationProvider.getApplicationContext();
             String dbName = "testAndroid.db";
             context.deleteDatabase(dbName);
             platformSQLite = new PlatformSQLite(context, dbName);

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ Usage`
`45`	`45`
`46`	`46`	```gradle
`47`	`47`	`dependencies {`
`48`		`- implementation 'io.requery:sqlite-android:3.25.3'`
	`48`	`+ implementation 'io.requery:sqlite-android:3.26.0'`
`49`	`49`	`}`
`50`	`50`	```
`51`	`51`	Then change usages of `android.database.sqlite.SQLiteDatabase` to
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ buildscript {`
`4`	`4`	`jcenter()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.android.tools.build:gradle:3.1.4'`
	`7`	`+ classpath 'com.android.tools.build:gradle:3.2.1'`
`8`	`8`	`classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.3'`
`9`		`- classpath 'org.apache.httpcomponents:httpclient:4.5.3'`
	`9`	`+ classpath 'org.apache.httpcomponents:httpclient:4.5.6'`
`10`	`10`	`}`
`11`	`11`	`}`
`12`	`12`