Merge pull request #43 from Cobrijani/release-v2.0

Release v2.0

.travis.yml

@@ -40,14 +40,8 @@ android:
    - google-gdk-license-.+
 
 before_install:
-  - yes | sdkmanager "platforms;android-27"
-  - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
-  - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
-  - cd CyFile-Android
-  - chmod +x gradlew
- # - openssl aes-256-cbc -K $encrypted_51c6121dfd24_key -iv $encrypted_51c6121dfd24_iv -in cyfile-release-keystore.jks.enc -out cyfile-release-keystore.jks -d
-  - ./gradlew dependencies || true
+# - openssl aes-256-cbc -K $encrypted_5d1391afea9a_key -iv $encrypted_5d1391afea9a_iv -in google-services.json.enc -out google-services.json -d
+- yes | sdkmanager "platforms;android-27"
 
 before_script:
   - echo no | android create avd --force -n test -t android-$EMULATOR_API_LEVEL --abi google_apis/armeabi-v7a
@@ -58,14 +52,4 @@ script:
   - echo "Travis branch is $TRAVIS_BRANCH"
   - echo "Travis branch is in pull request $TRAVIS_PULL+REQUEST"
   - ./gradlew test
-  - "./gradlew clean build connectedCheck -PdisablePreDex --stacktrace"
-
-
-# before_deploy:
-# - cp $TRAVIS_BUILD_DIR/.keystore $HOME
-# - cd app/build/outputs/apk/
-# - jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore $HOME/keystore.jks -storepass $storepass -keypass $keypass app-release-unsigned.apk cyfile-sign-key
-
-# # Verification
-# - jarsigner -verify app-release-unsigned.apk
-# - "${ANDROID_HOME}/build-tools/$ANDROID_BUILD_TOOLS/zipalign -v 4 app-release-unsigned.apk yourapp.apk"
+#  - ./gradlew connectedAndroidTest

CyFile-Android/app/.gitignore

@@ -1 +1,2 @@
 /build
+google-services.json

CyFile-Android/app/build.gradle

@@ -4,27 +4,42 @@ apply plugin: 'kotlin-android'
 
 apply plugin: 'kotlin-android-extensions'
 
+apply from: './../gradle/jacoco.gradle'
+
 android {
     compileSdkVersion 27
     defaultConfig {
         applicationId "at.tugraz.tc.cyfile"
-        minSdkVersion 19
+        minSdkVersion 23
         targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            testCoverageEnabled true
+        }
     }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+
+    testOptions {
+        unitTests.all {
+            jacoco {
+                includeNoLocationClasses = true
+            }
+        }
+    }
 }
 
 configurations.all {
@@ -41,12 +56,16 @@ dependencies {
     implementation "com.google.dagger:dagger-android-support:$dagger_version"
     implementation "com.blankj:utilcode:$util_version"
     implementation "com.andrognito.patternlockview:patternlockview:$pattern_lock_version"
-    implementation "android.arch.lifecycle:extensions:1.1.1"
-
+    implementation "android.arch.lifecycle:extensions:$lifecycle_version"
+    implementation "com.android.support:design:$android_support_design_version"
+    implementation "co.dift.ui.swipetoaction:library:$swipe_to_action_version"
+    implementation "org.apache.commons:commons-lang3:$apache_commons_version"
+    implementation "commons-codec:commons-codec:$apache_codec_version"
 
     //testing
     testImplementation "junit:junit:$junit_version"
     testImplementation "org.mockito:mockito-core:$mockito_version"
+    testImplementation "nl.jqno.equalsverifier:equalsverifier:$equal_verifier_version"
 
     //android testing
     androidTestImplementation "com.android.support.test:runner:$test_runner_version"
@@ -60,5 +79,3 @@ dependencies {
     compileOnly "org.projectlombok:lombok:$lombok_version"
     annotationProcessor "org.projectlombok:lombok:$lombok_version"
 }
-
-

CyFile-Android/app/src/androidTest/java/at/tugraz/tc/cyfile/BaseInstrumentedTest.java

@@ -1,6 +1,11 @@
 package at.tugraz.tc.cyfile;
 
 import android.support.test.InstrumentationRegistry;
+import android.support.test.espresso.ViewAction;
+import android.support.test.espresso.action.GeneralLocation;
+import android.support.test.espresso.action.GeneralSwipeAction;
+import android.support.test.espresso.action.Press;
+import android.support.test.espresso.action.Swipe;
 import android.support.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
@@ -22,4 +27,10 @@ public void initialization() {
                         .getTargetContext()
                         .getApplicationContext();
     }
+
+
+    protected static ViewAction swipeFromCenterToBottom() {
+        return new GeneralSwipeAction(Swipe.FAST, GeneralLocation.CENTER,
+                GeneralLocation.BOTTOM_CENTER, Press.FINGER);
+    }
 }

CyFile-Android/app/src/androidTest/java/at/tugraz/tc/cyfile/ExampleInstrumentedTest.kt

@@ -2,12 +2,10 @@ package at.tugraz.tc.cyfile
 
 import android.support.test.InstrumentationRegistry
 import android.support.test.runner.AndroidJUnit4
-
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *