Move Default configuration into core module.

liato · Aug 29, 2015 · 7c4437b · 7c4437b
1 parent 394d470
commit 7c4437b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 3 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -84,6 +84,7 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':bankdroid-legacy')
+    compile project(':bankdroid-core')
     compile 'com.jakewharton:butterknife:6.1.0'
     compile "com.android.support:appcompat-v7:22.0.+"
     compile 'com.google.collections:google-collections:1.0'

diff --git a/app/src/main/java/com/liato/bankdroid/BankEditActivity.java b/app/src/main/java/com/liato/bankdroid/BankEditActivity.java
@@ -26,10 +26,10 @@
 import com.liato.bankdroid.banking.Bank;
 import com.liato.bankdroid.banking.BankChoice;
 import com.liato.bankdroid.banking.BankFactory;
-import com.liato.bankdroid.banking.DefaultConnectionConfiguration;
 import com.liato.bankdroid.banking.exceptions.BankChoiceException;
 import com.liato.bankdroid.banking.exceptions.BankException;
 import com.liato.bankdroid.banking.exceptions.LoginException;
+import com.liato.bankdroid.configuration.DefaultConnectionConfiguration;
 import com.liato.bankdroid.db.DBAdapter;
 import com.liato.bankdroid.utils.FieldTypeMapper;
 import com.liato.bankdroid.utils.NetworkUtils;

diff --git a/bankdroid-core/build.gradle b/bankdroid-core/build.gradle
@@ -0,0 +1,8 @@
+apply plugin: 'java'
+
+sourceCompatibility = JavaVersion.VERSION_1_7
+targetCompatibility = JavaVersion.VERSION_1_7
+
+dependencies {
+	compile project(':bankdroid-interface')
+}
diff --git a/...nking/DefaultConnectionConfiguration.java → ...ation/DefaultConnectionConfiguration.java b/...nking/DefaultConnectionConfiguration.java → ...ation/DefaultConnectionConfiguration.java
@@ -1,4 +1,4 @@
-package com.liato.bankdroid.banking;
+package com.liato.bankdroid.configuration;
 
 import com.liato.bankdroid.api.configuration.Field;
 import com.liato.bankdroid.api.configuration.FieldBuilder;

diff --git a/...ain/resources/i18n/application.properties → ...ain/resources/i18n/application.properties b/...ain/resources/i18n/application.properties → ...ain/resources/i18n/application.properties
diff --git a/...sources/i18n/application_sv_SE.properties → ...sources/i18n/application_sv_SE.properties b/...sources/i18n/application_sv_SE.properties → ...sources/i18n/application_sv_SE.properties
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':bankdroid-legacy', ':bankdroid-interface'
+include ':app', ':bankdroid-core', ':bankdroid-legacy', ':bankdroid-interface'
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		include ':app', ':bankdroid-legacy', ':bankdroid-interface'
		include ':app', ':bankdroid-core', ':bankdroid-legacy', ':bankdroid-interface'