aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2013-01-30 18:01:08 -0800
committerXavier Ducrohet <xav@android.com>2013-01-30 18:37:54 -0800
commit8910657f79035d9244941e4c6b7d5d2cf624439b (patch)
tree981545725e120b889bf7794491136dc9f953250a /tests
parent48d026462152e1c12b689bb0a656bad6db82deb9 (diff)
downloadbuild-8910657f79035d9244941e4c6b7d5d2cf624439b.tar.gz
Clean dependencies of published libraries.
Change-Id: Icb3a75c7e79cbb58c0e529018f318323c649b475
Diffstat (limited to 'tests')
-rw-r--r--tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java9
-rw-r--r--tests/repo/baseLibrary/build.gradle1
-rw-r--r--tests/repo/util/build.gradle4
-rw-r--r--tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java7
4 files changed, 15 insertions, 6 deletions
diff --git a/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java b/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
index 11d7c32..60dd603 100644
--- a/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
+++ b/tests/repo/app/src/main/java/com/example/android/multiproject/MainActivity.java
@@ -5,6 +5,10 @@ import android.view.View;
import android.content.Intent;
import android.os.Bundle;
+import java.util.List;
+import com.example.android.multiproject.person.Person;
+import com.google.common.collect.Lists;
+
import com.example.android.multiproject.library.ShowPeopleActivity;
public class MainActivity extends Activity {
@@ -12,6 +16,11 @@ public class MainActivity extends Activity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
+
+ // some random code to test dependencies on util and guava
+ Person p = new Person("foo");
+ List<Person> persons = Lists.newArrayList();
+ persons.add(p);
}
public void sendMessage(View view) {
diff --git a/tests/repo/baseLibrary/build.gradle b/tests/repo/baseLibrary/build.gradle
index fc1a70a..89445f9 100644
--- a/tests/repo/baseLibrary/build.gradle
+++ b/tests/repo/baseLibrary/build.gradle
@@ -16,6 +16,7 @@ repositories {
dependencies {
compile 'com.example.android.multiproject:util:1.0'
+ releaseCompile 'com.google.guava:guava:11.0.2'
}
android {
diff --git a/tests/repo/util/build.gradle b/tests/repo/util/build.gradle
index 2baca33..150b997 100644
--- a/tests/repo/util/build.gradle
+++ b/tests/repo/util/build.gradle
@@ -5,10 +5,6 @@ repositories {
mavenCentral()
}
-dependencies {
- compile 'com.google.guava:guava:11.0.2'
-}
-
group = 'com.example.android.multiproject'
archivesBaseName = 'util'
version = '1.0'
diff --git a/tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java b/tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java
index 8b99248..2dbc9b5 100644
--- a/tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java
+++ b/tests/repo/util/src/main/java/com/example/android/multiproject/person/People.java
@@ -1,10 +1,13 @@
package com.example.android.multiproject.person;
+import java.util.ArrayList;
import java.util.Iterator;
-import com.google.common.collect.Lists;
public class People implements Iterable<Person> {
public Iterator<Person> iterator() {
- return Lists.newArrayList(new Person("Fred"), new Person("Barney")).iterator();
+ ArrayList<Person> list = new ArrayList<Person>();
+ list.add(new Person("Fred"));
+ list.add(new Person("Barney"));
+ return list.iterator();
}
}