Skip to content
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.

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

Update to latest build tools and increase buffer size to speed up copying #57

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apply plugin: 'android-library'

android {
buildToolsVersion '19.0.0'
compileSdkVersion 19
buildToolsVersion '21.1.1'
compileSdkVersion 21

defaultConfig {
minSdkVersion 7
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static List<String> 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);
Expand Down
8 changes: 4 additions & 4 deletions samples/database-v1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
10 changes: 5 additions & 5 deletions samples/database-v13-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}
}
Expand Down
8 changes: 4 additions & 4 deletions samples/database-v2-upgrade/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down