Gradle folder restructure (library)

Author: nostra13

library/AndroidManifest.xml

@@ -1,26 +1,14 @@
 apply plugin: 'com.android.library'
 
-dependencies {
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.0-rc3'
-    testCompile 'com.squareup.assertj:assertj-android:1.0.0'
-}
-
 android {
     compileSdkVersion 22
     buildToolsVersion "22.0.1"
 
     defaultConfig {
         minSdkVersion 5
         targetSdkVersion 22
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-        }
+        versionCode 40
+        versionName "1.9.5"
     }
 
     compileOptions {
@@ -29,6 +17,13 @@ android {
     }
 }
 
+dependencies {
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.robolectric:robolectric:3.0-rc3'
+    testCompile 'com.squareup.assertj:assertj-android:1.0.0'
+}
+
+
 // build a jar with source files
 task sourcesJar(type: Jar) {
     from android.sourceSets.main.java.srcDirs

library/build.gradle

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.nostra13.universalimageloader"/>

library/src/main/AndroidManifest.xml

@@ -964,11 +964,11 @@ private IOException invalidLengths(String[] strings) throws IOException {
 		}
 
 		public File getCleanFile(int i) {
-			return new File(directory, key + "." + i);
+			return new File(directory, key + "" + i);
 		}
 
 		public File getDirtyFile(int i) {
-			return new File(directory, key + "." + i + ".tmp");
+			return new File(directory, key + "" + i + ".tmp");
 		}
 	}
 }

library/src/com/nostra13/universalimageloader/cache/disc/DiskCache.java renamed to library/src/main/java/com/nostra13/universalimageloader/cache/disc/DiskCache.java

@@ -1,10 +1,10 @@
-package com.nostra13.universalimageloader.core.assist;
-
-/**
- * Source image loaded from.
- *
- * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
- */
-public enum LoadedFrom {
-	NETWORK, DISC_CACHE, MEMORY_CACHE
-}
+package com.nostra13.universalimageloader.core.assist;
+
+/**
+ * Source image loaded from.
+ *
+ * @author Sergey Tarasevich (nostra13[at]gmail[dot]com)
+ */
+public enum LoadedFrom {
+	NETWORK, DISC_CACHE, MEMORY_CACHE
+}