Merge pull request #10 from novoda/update_to_buildtools_0.13.0

Update to buildtools 0.14.2

Author: Xavi Rigau

.gitignore

@@ -1,8 +1,38 @@
+# built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+out/
+build.log
+build-log.xml
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+.project
+.classpath
 .settings
-.gradle
-/local.properties
-/.idea
-*/build
-/classes
-.DS_Store
+target/
+build/
+classes/
+gen-external-apklibs/
+tmp/
+
+# IDEA Ignores
 *.iml
+*.ipr
+*.iws
+.idea/
+.gradle/
+
+# MAC
+*.DS_Store

analyzer/build.gradle

@@ -11,12 +11,12 @@ apply plugin: 'maven'
 apply plugin: 'signing'
 
 dependencies {
-    compile 'org.xerial:sqlite-jdbc:3.7.15-SNAPSHOT'
+    compile 'org.xerial:sqlite-jdbc:3.8.7'
 
     compile gradleApi()
     compile localGroovy()
 
-    testCompile 'junit:junit:4.+'
+    testCompile 'junit:junit:4.11'
 }
 
 group = 'com.novoda'

analyzer/src/main/groovy/com/novoda/sqlite/generator/GetAutoTableCreateGenerator.groovy

@@ -31,7 +31,7 @@ public static $returnType create(\
 
     private createColumns() {
         def columns = []
-        table.columns.each {
+        table.noIdColumns.each {
             Column column -> columns << ['type': column.dataType, 'name': column.camelizedSmallName, 'access': column.getterPrefix + column.camelizedName]
         }
         return columns

analyzer/src/main/groovy/com/novoda/sqlite/generator/TableJavaCategory.groovy

@@ -4,10 +4,8 @@ import com.novoda.sqlite.model.Table
 
 class TableJavaCategory {
 
-    private static orgColumns = Table.metaClass.getMetaMethod('getColumns', [] as Class[])
-
-    static Column[] getColumns(Table table) {
-        orgColumns.invoke(table).grep({it.name != '_id'})
+    static Column[] getNoIdColumns(Table table) {
+        table.columns.grep({it.name != '_id'})
     }
 }
 

analyzer/src/main/java/com/novoda/sqlite/FileConnector.java

@@ -15,6 +15,13 @@ public FileConnector(File dbFile) {
 
     @Override
     public Connection connect() throws SQLException {
+        try {
+            // Dynamically load the class in order to correctly initialise JDBC drivers, as described in
+            // http://stackoverflow.com/questions/6740601/what-does-class-fornameorg-sqlite-jdbc-do/6740632#6740632
+            Class.forName("org.sqlite.JDBC");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
         String dbPath = "jdbc:sqlite:" + dbFile.getAbsolutePath();
         return DriverManager.getConnection(dbPath);
     }

analyzer/src/main/java/com/novoda/sqlite/MigrationsConnector.java

@@ -20,6 +20,14 @@ public MigrationsConnector(Migrations migrations) {
 
     @Override
     public Connection connect() throws SQLException {
+        try {
+            // Dynamically load the class in order to correctly initialise JDBC drivers, as described in
+            // http://stackoverflow.com/questions/6740601/what-does-class-fornameorg-sqlite-jdbc-do/6740632#6740632
+            Class.forName("org.sqlite.JDBC");
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+
         Connection connection = DriverManager.getConnection("jdbc:sqlite::memory:");
         executeMigrations(connection);
         return connection;

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.9.+'
+        classpath 'com.android.tools.build:gradle:0.14.2'
         classpath 'com.novoda:gradle-android-command-plugin:1.1.0-SNAPSHOT'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.2'
     }
@@ -22,10 +22,10 @@ allprojects {
 }
 
 ext {
-    buildToolsVersion = '19.0.1'
+    buildToolsVersion = '19.1.0'
     compileSdkVersion = 19
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '1.10'
+    gradleVersion = '2.1'
 }

demo-auto/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 apply plugin: 'android-command'
 apply plugin: 'sqlite-access'
@@ -18,7 +18,7 @@ android {
 }
 
 dependencies {
-    compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.+'
+    compile 'com.readystatesoftware.sqliteasset:sqliteassethelper:2.0.1'
     compile 'javax.annotation:jsr250-api:1.0'
     compile 'com.google.auto.value:auto-value:1.0-rc1'
 }
@@ -27,4 +27,6 @@ sqliteAccess {
     databaseFile 'src/main/assets/databases/northwind.db'
     packageName 'com.example.sqlite'
     generateAuto true
-}
+}
+
+apply from: "$rootDir/team-props/lint.gradle"

demo-sqliteprovider/build.gradle

@@ -1,4 +1,4 @@
-apply plugin: 'android'
+apply plugin: 'com.android.application'
 apply plugin: 'android-command'
 apply plugin: 'sqlite-access'
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Mon Jan 27 13:37:31 CET 2014
+#Tue Sep 23 14:33:42 CEST 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip