Commits

Daniel Nadeau committed 5c3a44e Merge

Merged in sbgapps/holographlibrary/HoloGraphLibrary (pull request #16)

Updated target SDK version, build tools and gradle to latest versions.

  • Participants
  • Parent commits 6c54baa, 23fd9f3

Comments (0)

Files changed (9)

 gen/
 
 # Local configuration file (sdk path, etc)
-local.properties
+*.properties
 
 # Eclipse project files
 .classpath

File HoloGraphLibrary/AndroidManifest.xml

 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="16" />
+        android:targetSdkVersion="19" />
 
     <application
         android:allowBackup="true"

File HoloGraphLibrary/build.gradle

-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:0.6.+'
-    }
-}
-
 apply plugin: 'android-library'
 
 android {
-    compileSdkVersion 17
-    buildToolsVersion = 17
+    compileSdkVersion 19
+    buildToolsVersion '19.0.1'
 
     sourceSets {
-
         main {
-            assets.srcDirs       = ['assets']
-            res.srcDirs          = ['res']
-            aidl.srcDirs         = ['src']
-            resources.srcDirs    = ['src']
-            renderscript.srcDirs = ['src']
-            java.srcDirs         = ['src']
+            java.srcDirs = ['src']
+            res.srcDirs = ['res']
             manifest.srcFile 'AndroidManifest.xml'
-
         }
     }
 }
 
-
 dependencies {
-    compile 'com.android.support:support-v4:18.0.+'
+    compile 'com.android.support:support-v4:19.0.0'
 }

File HoloGraphLibrarySample/AndroidManifest.xml

 
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+        android:targetSdkVersion="19" />
 
     <application
         android:allowBackup="true"

File HoloGraphLibrarySample/build.gradle

 apply plugin: 'android'
 
-dependencies {
-  compile project(':HoloGraphLibrary')
-  compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
-
-}
-
 android {
-    compileSdkVersion 17
-    buildToolsVersion = 17
+    compileSdkVersion 19
+    buildToolsVersion '19.0.1'
 
     sourceSets {
         main {
         }
     }
 }
+
+dependencies {
+    compile project(':HoloGraphLibrary')
+    compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
+}
+

File HoloGraphLibrarySample/libs/android-support-v4.jar

Binary file removed.

File build.gradle

   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:0.6.+'
+    classpath 'com.android.tools.build:gradle:0.7.+'
   }
 }
 

File gradle/wrapper/gradle-wrapper.jar

Binary file modified.

File gradle/wrapper/gradle-wrapper.properties

-#Thu Dec 26 19:18:05 EST 2013
+#Sat Dec 28 17:18:23 CET 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-rc-3-all.zip