From a59e8ab3c270a5bb7a3910ca58526b1337f7cb15 Mon Sep 17 00:00:00 2001 From: Tim Kist Date: Thu, 14 Jan 2016 14:55:32 +0000 Subject: [PATCH 1/3] Update build system version --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 6 +++--- samples/database-v1/build.gradle | 6 +++--- samples/database-v13-upgrade/build.gradle | 9 +++------ samples/database-v2-upgrade/build.gradle | 6 +++--- 6 files changed, 15 insertions(+), 18 deletions(-) diff --git a/build.gradle b/build.gradle index 88e39d0..ec1c36d 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { } dependencies { - classpath "com.android.tools.build:gradle:0.7.+" + classpath 'com.android.tools.build:gradle:1.5.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9b8ffdd..85c4a5f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Wed Jan 13 15:54:05 GMT 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip diff --git a/library/build.gradle b/library/build.gradle index b8b9d9e..6b6735f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,7 +1,7 @@ -apply plugin: 'android-library' +apply plugin: 'com.android.library' android { - buildToolsVersion '19.0.0' + buildToolsVersion '19.1.0' compileSdkVersion 19 defaultConfig { @@ -11,7 +11,7 @@ android { android.libraryVariants.all { variant -> def name = variant.buildType.name - if (name.equals(com.android.builder.BuilderConstants.DEBUG)) { + if (name.equals(com.android.builder.core.BuilderConstants.DEBUG)) { return; // Skip debug builds. } def task = project.tasks.create "jar${name.capitalize()}", Jar diff --git a/samples/database-v1/build.gradle b/samples/database-v1/build.gradle index 708c923..1990f83 100644 --- a/samples/database-v1/build.gradle +++ b/samples/database-v1/build.gradle @@ -1,16 +1,16 @@ -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { compile project(':library') } android { - buildToolsVersion '19.0.0' + buildToolsVersion '19.1.0' compileSdkVersion 19 defaultConfig { minSdkVersion 8 - packageName 'com.example.sqliteassethelper' + applicationId 'com.example.sqliteassethelper' targetSdkVersion 19 versionCode 1 versionName '1.0' diff --git a/samples/database-v13-upgrade/build.gradle b/samples/database-v13-upgrade/build.gradle index 131d755..eb83200 100644 --- a/samples/database-v13-upgrade/build.gradle +++ b/samples/database-v13-upgrade/build.gradle @@ -2,11 +2,8 @@ buildscript { repositories { mavenCentral() } - dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' - } } -apply plugin: 'android' +apply plugin: 'com.android.application' repositories { mavenCentral() @@ -14,7 +11,7 @@ repositories { android { compileSdkVersion 19 - buildToolsVersion "19.0.0" + buildToolsVersion "19.1.0" defaultConfig { minSdkVersion 8 @@ -24,7 +21,7 @@ android { } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } diff --git a/samples/database-v2-upgrade/build.gradle b/samples/database-v2-upgrade/build.gradle index 2be5d87..e11f473 100644 --- a/samples/database-v2-upgrade/build.gradle +++ b/samples/database-v2-upgrade/build.gradle @@ -1,16 +1,16 @@ -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { compile project(':library') } android { - buildToolsVersion '19.0.0' + buildToolsVersion '19.1.0' compileSdkVersion 19 defaultConfig { minSdkVersion 8 - packageName 'com.example.sqliteassethelper' + applicationId 'com.example.sqliteassethelper' targetSdkVersion 19 versionCode 2 versionName '2.0' From 45f2feeadc6fc51cddd48262a007963cac934ea9 Mon Sep 17 00:00:00 2001 From: Tim Kist Date: Thu, 14 Jan 2016 17:14:12 +0000 Subject: [PATCH 2/3] Fix database locking issue for setForcedUpgrade() Due to an unclosed database --- .../com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java b/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java index ebee1c9..27c58f8 100755 --- a/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java +++ b/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java @@ -179,6 +179,8 @@ public synchronized SQLiteDatabase getWritableDatabase() { // do force upgrade if (version != 0 && version < mForcedUpgradeVersion) { + //Close the old database + db.close(); db = createOrOpenDatabase(true); db.setVersion(mNewVersion); version = db.getVersion(); From 450aa03f3c4f69d7d1e41bc1817ff70a17d87719 Mon Sep 17 00:00:00 2001 From: p-schneider Date: Fri, 3 Feb 2017 00:21:33 +0100 Subject: [PATCH 3/3] fix upgrade behavior with setForcedUpgrade() if the bundled database's version is lower than the desired destination (mNewVersion) --- .../com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java b/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java index 27c58f8..7f618ba 100755 --- a/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java +++ b/library/src/main/java/com/readystatesoftware/sqliteasset/SQLiteAssetHelper.java @@ -182,8 +182,10 @@ public synchronized SQLiteDatabase getWritableDatabase() { //Close the old database db.close(); db = createOrOpenDatabase(true); - db.setVersion(mNewVersion); + Log.w(TAG, "Forced Upgrade because " + version + " < " + mForcedUpgradeVersion); version = db.getVersion(); + if(version != mNewVersion) + Log.w(TAG, "Forced Upgrade got " + version + ", now an upgrade to " + mNewVersion + " is required"); } if (version != mNewVersion) {