Use the standard gradle project layout

.gitignore

@@ -1,13 +1,40 @@
-.settings/
 bin/
-tests/.settings/
-tests/bin/
-tests/libs/
 gen/
-*.class
 *~
-.gradle/
-build/
-.idea/
-authenticator.iml
+.project
+
+.gradle
+/local.properties
+/.idea/workspace.xml
+/.idea/libraries
+.DS_Store
+/build
+/gradle
+
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
 
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# files that end up being system specific
+.idea
+*.iml
+
+# this keeps wanting to update...
+gradle/wrapper/gradle-wrapper.properties
+/gradle/wrapper/gradle-wrapper.properties
+/gradle/wrapper/gradle-wrapper.properties
+
+# System specific stuff
+local.properties
+
+*~

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.source=1.6

app/.gitignore

@@ -0,0 +1 @@
+/build

app/build.gradle

@@ -0,0 +1,26 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        applicationId "com.tortel.authenticator"
+        minSdkVersion 14
+        targetSdkVersion 21
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:21.0.+'
+    compile 'com.afollestad:material-dialogs:0.5.2'
+
+    compile files('libs/*.jar')
+}

AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -18,8 +18,6 @@
           xmlns:tools="http://schemas.android.com/tools"
           package="com.tortel.authenticator" >
 
-  <uses-sdk tools:node="replace" />
-
   <uses-permission android:name="android.permission.VIBRATE" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
@@ -33,8 +31,7 @@
                android:icon="@drawable/ic_launcher_authenticator"
                android:theme="@style/AuthenticatorTheme"
                android:name="com.tortel.authenticator.AuthenticatorApplication"
-               android:allowBackup="false"
-               tools:replace="android:allowBackup">
+               android:allowBackup="false" >
 
     <activity android:name="com.tortel.authenticator.AuthenticatorActivity"
               android:label="@string/app_name_short"

build.gradle

@@ -1,72 +1,15 @@
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:1.0.0'
     }
 }
-apply plugin: 'android'
 
-repositories {
-    mavenCentral()
-}
-
-dependencies {
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.4.2'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.4.2'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.4.2'
-    compile 'com.android.support:cardview-v7:+'
-}
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
-
-    defaultConfig {
-        applicationId 'com.tortel.authenticator'
-        minSdkVersion 14
-        targetSdkVersion 19
-        versionCode 1
-        versionName '1.0'
-    }
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['src']
-            aidl.srcDirs = ['src']
-            renderscript.srcDirs = ['src']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-
-        // Move the tests to tests/java, tests/res, etc...
-        instrumentTest.setRoot('tests')
-
-        // Move the build types to build-types/<type>
-        // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
-        // This moves them out of them default location under src/<type>/... which would
-        // conflict with src/ being used by the main source set.
-        // Adding new build types or product flavors should be accompanied
-        // by a similar customization.
-        debug.setRoot('build-types/debug')
-        release.setRoot('build-types/release')
-    }
-
-    // WTF? Why is this needed?
-    packagingOptions {
-        exclude 'META-INF/DEPENDENCIES.txt'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/notice.txt'
-        exclude 'META-INF/license.txt'
-        exclude 'META-INF/dependencies.txt'
-        exclude 'META-INF/LGPL2.1'
+allprojects {
+    repositories {
+        jcenter()
     }
-
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Fri Jan 02 09:41:46 EST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

settings.gradle

@@ -0,0 +1 @@
+include ':app'