Merge manually from 842945e5b782, correct build configuration to assert. ICAL4J_EMBED_1

Sat, 14 Feb 2015 21:28:43 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 14 Feb 2015 21:28:43 +0100
branch
ICAL4J_EMBED_1
changeset 32
40e965b10350
parent 27
eb2016286407
child 33
a6e06f8d463c

Merge manually from 842945e5b782, correct build configuration to assert.

build.gradle file | annotate | diff | comparison | revisions
src/org/gege/caldavsyncadapter/android/entities/AndroidEvent.java file | annotate | diff | comparison | revisions
     1.1 --- a/build.gradle	Sat Feb 14 00:38:55 2015 +0100
     1.2 +++ b/build.gradle	Sat Feb 14 21:28:43 2015 +0100
     1.3 @@ -43,7 +43,7 @@
     1.4  }
     1.5  
     1.6  dependencies {
     1.7 -    compile 'junit:junit:4.+'
     1.8 +    androidTestCompile 'junit:junit:4.+'
     1.9      compile 'com.android.support:support-v4:19.1.0'
    1.10      compile 'org.mnode.ical4j:ical4j:1.0.6'
    1.11  }
     2.1 --- a/src/org/gege/caldavsyncadapter/android/entities/AndroidEvent.java	Sat Feb 14 00:38:55 2015 +0100
     2.2 +++ b/src/org/gege/caldavsyncadapter/android/entities/AndroidEvent.java	Sat Feb 14 21:28:43 2015 +0100
     2.3 @@ -72,7 +72,7 @@
     2.4  import java.net.URISyntaxException;
     2.5  import java.text.ParseException;
     2.6  
     2.7 -import static org.junit.Assert.*;
     2.8 +import static junit.framework.Assert.*;
     2.9  
    2.10  import com.europalab.caldavsyn.Appctxpro;
    2.11  

mercurial