diff --git a/build.gradle b/build.gradle index 88e39d0..466faa3 100644 --- a/build.gradle +++ b/build.gradle @@ -2,12 +2,15 @@ buildscript { repositories { mavenCentral() } - dependencies { - classpath "com.android.tools.build:gradle:0.7.+" + classpath 'com.android.tools.build:gradle:1.0.0-rc4' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files } } + allprojects { version = VERSION_NAME group = GROUP diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9b8ffdd..a1766a8 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 +#Sun Dec 07 12:05:56 HKT 2014 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.2.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index b8b9d9e..28d58cb 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'android-library' android { - buildToolsVersion '19.0.0' - compileSdkVersion 19 + buildToolsVersion '21.1.1' + compileSdkVersion 21 defaultConfig { minSdkVersion 7 @@ -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.BuilderConstants.DEBUG')) { return; // Skip debug builds. } def task = project.tasks.create "jar${name.capitalize()}", Jar diff --git a/library/src/main/java/com/readystatesoftware/sqliteasset/Utils.java b/library/src/main/java/com/readystatesoftware/sqliteasset/Utils.java index 67cecaf..fb63656 100644 --- a/library/src/main/java/com/readystatesoftware/sqliteasset/Utils.java +++ b/library/src/main/java/com/readystatesoftware/sqliteasset/Utils.java @@ -40,7 +40,7 @@ public static List splitSqlScript(String script, char delim) { } public static void writeExtractedFileToDisk(InputStream in, OutputStream outs) throws IOException { - byte[] buffer = new byte[1024]; + byte[] buffer = new byte[4096]; int length; while ((length = in.read(buffer))>0){ outs.write(buffer, 0, length); diff --git a/samples/database-v1/build.gradle b/samples/database-v1/build.gradle index 708c923..b91c65d 100644 --- a/samples/database-v1/build.gradle +++ b/samples/database-v1/build.gradle @@ -5,13 +5,13 @@ dependencies { } android { - buildToolsVersion '19.0.0' - compileSdkVersion 19 + compileSdkVersion 21 + buildToolsVersion "21.1.1" defaultConfig { minSdkVersion 8 - packageName 'com.example.sqliteassethelper' - targetSdkVersion 19 + applicationId 'com.example.sqliteassethelper' + targetSdkVersion 21 versionCode 1 versionName '1.0' } diff --git a/samples/database-v13-upgrade/build.gradle b/samples/database-v13-upgrade/build.gradle index 131d755..a17eefb 100644 --- a/samples/database-v13-upgrade/build.gradle +++ b/samples/database-v13-upgrade/build.gradle @@ -3,7 +3,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.+' + classpath 'com.android.tools.build:gradle:1.0.0-rc4+' } } apply plugin: 'android' @@ -13,18 +13,18 @@ repositories { } android { - compileSdkVersion 19 - buildToolsVersion "19.0.0" + compileSdkVersion 21 + buildToolsVersion "21.1.1" defaultConfig { minSdkVersion 8 - targetSdkVersion 19 + targetSdkVersion 21 versionCode 3 versionName "3.0" } 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..910c335 100644 --- a/samples/database-v2-upgrade/build.gradle +++ b/samples/database-v2-upgrade/build.gradle @@ -5,13 +5,13 @@ dependencies { } android { - buildToolsVersion '19.0.0' - compileSdkVersion 19 + buildToolsVersion '21.1.1' + compileSdkVersion 21 defaultConfig { minSdkVersion 8 - packageName 'com.example.sqliteassethelper' - targetSdkVersion 19 + applicationId 'com.example.sqliteassethelper' + targetSdkVersion 21 versionCode 2 versionName '2.0' }