Skip to content

Commit e8c8779

Browse files
android10android10
committed
Make everything compile in one module. Unit tests passing. Wip.
1 parent 248ba23 commit e8c8779

91 files changed

Lines changed: 264 additions & 401 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
1+
buildscript {
2+
repositories {
3+
mavenCentral()
4+
}
5+
dependencies {
6+
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
7+
}
8+
}
9+
110
apply plugin: 'com.android.application'
211
apply plugin: 'com.neenbedankt.android-apt'
312
apply plugin: 'com.fernandocejas.frodo'
13+
apply plugin: 'me.tatarka.retrolambda'
414

515
android {
616
def globalConfiguration = rootProject.extensions.getByName("ext")
@@ -20,8 +30,8 @@ android {
2030
}
2131

2232
compileOptions {
23-
sourceCompatibility JavaVersion.VERSION_1_7
24-
targetCompatibility JavaVersion.VERSION_1_7
33+
sourceCompatibility JavaVersion.VERSION_1_8
34+
targetCompatibility JavaVersion.VERSION_1_8
2535
}
2636

2737
packagingOptions {
@@ -61,17 +71,19 @@ android {
6171
dependencies {
6272
def presentationDependencies = rootProject.ext.presentationDependencies
6373
def presentationTestDependencies = rootProject.ext.presentationTestDependencies
74+
def dataDependencies = rootProject.ext.dataDependencies
75+
def testDependencies = rootProject.ext.dataTestDependencies
6476
def developmentDependencies = rootProject.ext.developmentDependencies
6577

66-
compile project(':domain')
67-
compile project(':data')
68-
6978
apt presentationDependencies.daggerCompiler
7079
compile presentationDependencies.dagger
80+
compile dataDependencies.okHttp
81+
compile dataDependencies.gson
7182
compile presentationDependencies.butterKnife
7283
compile presentationDependencies.recyclerView
7384
compile presentationDependencies.rxJava
7485
compile presentationDependencies.rxAndroid
86+
compile dataDependencies.androidAnnotations
7587
provided presentationDependencies.javaxAnnotation
7688

7789
androidTestCompile presentationTestDependencies.mockito
@@ -80,6 +92,11 @@ dependencies {
8092
androidTestCompile presentationTestDependencies.espresso
8193
androidTestCompile presentationTestDependencies.testingSupportLib
8294

95+
testCompile testDependencies.junit
96+
testCompile testDependencies.assertj
97+
testCompile testDependencies.mockito
98+
testCompile testDependencies.robolectric
99+
83100
//Development
84101
compile developmentDependencies.leakCanary
85102
}

‎app/src/androidTest/java/com/fernandocejas/android10/sample/test/exception/ErrorMessageFactoryTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
package com.fernandocejas.android10.sample.test.exception;
1717

1818
import android.test.AndroidTestCase;
19-
import com.fernandocejas.android10.sample.data.exception.NetworkConnectionException;
20-
import com.fernandocejas.android10.sample.data.exception.UserNotFoundException;
19+
import com.fernandocejas.android10.sample.app.data.exception.NetworkConnectionException;
20+
import com.fernandocejas.android10.sample.app.data.exception.UserNotFoundException;
2121
import com.fernandocejas.android10.sample.app.R;
2222
import com.fernandocejas.android10.sample.app.exception.ErrorMessageFactory;
2323

‎app/src/androidTest/java/com/fernandocejas/android10/sample/test/mapper/UserModelDataMapperTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
*/
1616
package com.fernandocejas.android10.sample.test.mapper;
1717

18-
import com.fernandocejas.android10.sample.domain.User;
19-
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
20-
import com.fernandocejas.android10.sample.app.model.UserModel;
18+
import com.fernandocejas.android10.sample.app.users.User;
19+
import com.fernandocejas.android10.sample.app.users.UserModelDataMapper;
20+
import com.fernandocejas.android10.sample.app.users.UserModel;
2121
import java.util.ArrayList;
2222
import java.util.Collection;
2323
import java.util.List;

‎app/src/androidTest/java/com/fernandocejas/android10/sample/test/presenter/UserDetailsPresenterTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import android.content.Context;
1919
import android.test.AndroidTestCase;
20-
import com.fernandocejas.android10.sample.domain.interactor.GetUserDetails;
21-
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
22-
import com.fernandocejas.android10.sample.app.presenter.UserDetailsPresenter;
23-
import com.fernandocejas.android10.sample.app.view.UserDetailsView;
20+
import com.fernandocejas.android10.sample.app.users.GetUserDetails;
21+
import com.fernandocejas.android10.sample.app.users.UserModelDataMapper;
22+
import com.fernandocejas.android10.sample.app.users.UserDetailsPresenter;
23+
import com.fernandocejas.android10.sample.app.users.UserDetailsView;
2424
import org.mockito.Mock;
2525
import org.mockito.MockitoAnnotations;
2626
import rx.Subscriber;

‎app/src/androidTest/java/com/fernandocejas/android10/sample/test/presenter/UserListPresenterTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717

1818
import android.content.Context;
1919
import android.test.AndroidTestCase;
20-
import com.fernandocejas.android10.sample.domain.interactor.GetUserList;
21-
import com.fernandocejas.android10.sample.app.mapper.UserModelDataMapper;
22-
import com.fernandocejas.android10.sample.app.presenter.UserListPresenter;
23-
import com.fernandocejas.android10.sample.app.view.UserListView;
20+
import com.fernandocejas.android10.sample.app.users.GetUserList;
21+
import com.fernandocejas.android10.sample.app.users.UserModelDataMapper;
22+
import com.fernandocejas.android10.sample.app.users.UserListPresenter;
23+
import com.fernandocejas.android10.sample.app.users.UserListView;
2424
import org.mockito.Mock;
2525
import org.mockito.MockitoAnnotations;
2626
import rx.Subscriber;

‎app/src/androidTest/java/com/fernandocejas/android10/sample/test/view/activity/UserDetailsActivityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import android.content.Intent;
2020
import android.test.ActivityInstrumentationTestCase2;
2121
import com.fernandocejas.android10.sample.app.R;
22-
import com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity;
22+
import com.fernandocejas.android10.sample.app.users.UserDetailsActivity;
2323

2424
import static android.support.test.espresso.Espresso.onView;
2525
import static android.support.test.espresso.assertion.ViewAssertions.matches;

‎app/src/androidTest/java/com/fernandocejas/android10/sample/test/view/activity/UserListActivityTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import android.content.Intent;
2020
import android.test.ActivityInstrumentationTestCase2;
2121
import com.fernandocejas.android10.sample.app.R;
22-
import com.fernandocejas.android10.sample.app.view.activity.UserListActivity;
22+
import com.fernandocejas.android10.sample.app.users.UserListActivity;
2323

2424
import static org.hamcrest.CoreMatchers.is;
2525
import static org.hamcrest.CoreMatchers.notNullValue;

‎app/src/main/AndroidManifest.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
android:theme="@style/AppTheme">
1414

1515
<activity
16-
android:name="com.fernandocejas.android10.sample.app.view.activity.MainActivity"
16+
android:name=".core.view.activity.MainActivity"
1717
android:label="@string/app_name">
1818
<intent-filter>
1919
<action android:name="android.intent.action.MAIN" />
@@ -22,12 +22,12 @@
2222
</activity>
2323

2424
<activity
25-
android:name="com.fernandocejas.android10.sample.app.view.activity.UserListActivity"
25+
android:name=".users.UserListActivity"
2626
android:label="@string/activity_title_user_list">
2727
</activity>
2828

2929
<activity
30-
android:name="com.fernandocejas.android10.sample.app.view.activity.UserDetailsActivity"
30+
android:name=".users.UserDetailsActivity"
3131
android:label="@string/activity_title_user_details">
3232
</activity>
3333
</application>

‎app/src/main/java/com/fernandocejas/android10/sample/app/AndroidApplication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package com.fernandocejas.android10.sample.app;
1717

1818
import android.app.Application;
19-
import com.fernandocejas.android10.sample.app.internal.di.components.ApplicationComponent;
20-
import com.fernandocejas.android10.sample.app.internal.di.components.DaggerApplicationComponent;
21-
import com.fernandocejas.android10.sample.app.internal.di.modules.ApplicationModule;
19+
import com.fernandocejas.android10.sample.app.core.di.components.ApplicationComponent;
20+
import com.fernandocejas.android10.sample.app.core.di.components.DaggerApplicationComponent;
21+
import com.fernandocejas.android10.sample.app.core.di.modules.ApplicationModule;
2222
import com.squareup.leakcanary.LeakCanary;
2323

2424
/**

app/src/main/java/com/fernandocejas/android10/sample/app/internal/di/HasComponent.java renamed to app/src/main/java/com/fernandocejas/android10/sample/app/core/di/HasComponent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package com.fernandocejas.android10.sample.app.internal.di;
16+
package com.fernandocejas.android10.sample.app.core.di;
1717

1818
/**
1919
* Interface representing a contract for clients that contains a component for dependency injection.

0 commit comments

Comments
 (0)