ResearchStack · PriyankaKambleTouchcore · Nov 1, 2017 · Nov 1, 2017 · Nov 3, 2017 · Nov 3, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: android
 # Required to run retrolambda
 jdk:
     - oraclejdk8
-    
+
 android:
   components:
     # Uncomment the lines below if you want to
@@ -14,10 +14,10 @@ android:
     # The BuildTools version used by your project
     # per travis-ci issue #5036, add '-tools' to use build-tools-23.0.2
     - tools
-    - build-tools-23.0.2
+    - build-tools-28.0.2
 
     # The SDK version used to compile your project
-    - android-23
+    - android-28
 
     # Additional components go here.
     - extra-android-support
@@ -31,12 +31,7 @@ before_install:
   - export JAVA8_HOME=/usr/lib/jvm/java-8-oracle
   - export JAVA_HOME=$JAVA8_HOME
 
-before_script:
-  # Tests crash if a local.properties file isn't present; this file is not kept
-  # under version control. Create an empty local.properties for testing.
-  - touch local.properties
-
-script: ./gradlew test
+script: ./gradlew build
 
 # Uncomment line below to add post-test scripts.
 # after_script:

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -34,15 +34,13 @@ Then add the following entry to your dependencies in your app build.gradle:
 dependencies {
     ...
     compile 'org.researchstack:backbone:VERSION'
-    // or (if using Skin, you don't need Backbone since it is included)
-    compile 'org.researchstack:skin:VERSION'
     ...
 }
 ```
 
 ## Running tests
 
-Tests are located in the /backbone/src/test or /skin/src/test folder. Run the tests in Android Studio by right clicking on 'backbone' or 'skin' and clicking "Run 'All Tests'".
+Tests are located in the /backbone/src/test folder. Run the tests in Android Studio by right clicking on 'backbone' or 'skin' and clicking "Run 'All Tests'".
 
 ## Code Style
 

diff --git a/README.md b/README.md
@@ -14,7 +14,6 @@ Documentation is written and maintained using [Javadoc](http://www.oracle.com/te
 Add one or both to your app/build.gradle:
 ```groovy
 compile 'org.researchstack:backbone:1.1.1'
-compile 'org.researchstack:skin:1.1.1'
 ```
 
 You may also need to add the following source repos to your project's build.gradle:

diff --git a/backbone/.classpath b/backbone/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>
diff --git a/backbone/.project b/backbone/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>backbone</name>
+	<comment>Project backbone created by Buildship.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+	</natures>
+</projectDescription>
diff --git a/backbone/.settings/org.eclipse.buildship.core.prefs b/backbone/.settings/org.eclipse.buildship.core.prefs
@@ -0,0 +1,2 @@
+connection.project.dir=..
+eclipse.preferences.version=1
diff --git a/backbone/build.gradle b/backbone/build.gradle
@@ -1,20 +1,21 @@
 apply plugin: 'com.android.library'
-apply plugin: 'me.tatarka.retrolambda'
-apply plugin: 'com.neenbedankt.android-apt'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
+apply plugin: 'maven-publish'
 
-version = '1.1.2'
+version = '2.0.0-SNAPSHOT'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.2"
+    compileSdkVersion 28
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 23
+        minSdkVersion 19
+        targetSdkVersion 28
         versionCode 6
         versionName version
+        vectorDrawables.useSupportLibrary = true
+
+        multiDexEnabled true
     }
     buildTypes {
         release {
@@ -36,8 +37,13 @@ android {
     resourcePrefix 'rsb_'
 }
 
+// Reading in data from local.properties is used here to grab key/value pairs used below in ext
+// Originally, it read the local.properties, but this file should never be committed to vcs,
+// So check if it exists first, because some projects may not care about it
 Properties properties = new Properties()
-properties.load(project.rootProject.file('local.properties').newDataInputStream())
+if (project.rootProject.file('local.properties').exists()) {
+    properties.load(project.rootProject.file('local.properties').newDataInputStream())
+}
 
 ext {
     bintrayRepo = 'ResearchStack'
@@ -54,6 +60,8 @@ ext {
 
     libraryVersion = version
 
+    // This grabs the key/value pairs from local.properties and assigns them to variables that
+    // can be used in gradle, and specifically, the mavenInstaller below
     userOrgName = 'researchstack'
     developerId = properties.getProperty("bintray.user")
     developerName = properties.getProperty("bintray.developerName")
@@ -65,27 +73,57 @@ ext {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:cardview-v7:23.2.1'
-    compile 'com.android.support:preference-v14:23.2.1'
-    compile 'com.android.support:design:23.2.1'
-    compile 'com.google.code.gson:gson:2.4'
-    compile 'io.reactivex:rxjava:1.1.3'
-    compile 'io.reactivex:rxandroid:1.1.0'
-    compile 'com.jakewharton.rxbinding:rxbinding:0.2.0'
-    compile 'com.jakewharton.rxbinding:rxbinding-support-v4:0.2.0'
-    compile 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.2.0'
-    compile 'com.jakewharton.rxbinding:rxbinding-design:0.2.0'
-    compile 'com.github.PhilJay:MPAndroidChart:v2.2.3'
-
-    compile 'com.scottyab:aes-crypto:0.0.3'
-    compile 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
-    apt 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
-    compile 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.robolectric:robolectric:3.0'
-    testCompile 'org.mockito:mockito-core:1.10.19'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    // These are all support libraries that should be updated when Google releases new ones
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:cardview-v7:28.0.0'
+    implementation 'com.android.support:preference-v14:28.0.0'
+    implementation 'com.android.support:support-annotations:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:support-v4:28.0.0'
+
+    implementation 'com.android.support:multidex:1.0.3'
+
+    api 'io.reactivex:rxjava:1.3.0'
+    implementation 'nl.littlerobots.rxlint:rxlint:1.6.1'
+    implementation 'com.google.code.gson:gson:2.8.2'
+
+    implementation 'com.cronutils:cron-utils:3.1.2', {
+        exclude group: 'joda-time', module: 'joda-time' // this can cause dex errors due to duplicate joda times
+    }
+    api 'net.danlew:android.joda:2.9.9.4' // android specific joda time, jre version causes perf problems
+    testImplementation 'joda-time:joda-time:2.9.9'
+
+    implementation 'com.squareup.retrofit2:retrofit:2.3.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
+    implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.9.1'
+
+    implementation 'io.reactivex:rxandroid:1.2.1'
+
+    implementation 'com.jakewharton.rxbinding:rxbinding:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-support-v4:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-appcompat-v7:0.4.0'
+    implementation 'com.jakewharton.rxbinding:rxbinding-design:0.4.0'
+
+    // Used to display UploadData and study data in various chart formats
+    api 'com.github.PhilJay:MPAndroidChart:v2.2.3'
+
+    implementation 'com.scottyab:aes-crypto:0.0.3'
+    api 'co.touchlab.squeaky:squeaky-query:0.4.0.0'
+    annotationProcessor 'co.touchlab.squeaky:squeaky-processor:0.4.0.0'
+    api 'net.zetetic:android-database-sqlcipher:3.5.4@aar'
+
+    // Libraries to help with unit testing
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.8.9'
+    testImplementation 'org.powermock:powermock-api-mockito2:1.7.1'
+    testImplementation 'org.powermock:powermock-module-junit4-rule-agent:1.7.1'
+    testImplementation 'org.powermock:powermock-module-junit4-rule:1.7.1'
+    testImplementation 'org.powermock:powermock-module-junit4:1.7.1'
+
+    testImplementation 'org.robolectric:robolectric:3.5'
 }
 
 group = publishedGroupId                               // Maven Group ID for the artifact
@@ -137,6 +175,9 @@ if (project.hasProperty("android")) { // Android libraries
     task javadoc(type: Javadoc) {
         failOnError false
         source = android.sourceSets.main.java.srcDirs
+        // Exclude generated files
+        exclude '**/BuildConfig.java'
+        exclude '**/R.java'
     }
 
     afterEvaluate {

diff --git a/backbone/lint.xml b/backbone/lint.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="MissingTranslation" severity="informational"/>
+    <issue id="RxLeakedSubscription" severity="warning"/>
+    <issue id="RxSubscribeOnError" severity="warning"/>
+</lint>
diff --git a/backbone/src/main/AndroidManifest.xml b/backbone/src/main/AndroidManifest.xml
@@ -1 +1,20 @@
-<manifest package="org.researchstack.backbone" />
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.researchstack.backbone">
+
+    <!-- We allow users to secure their data using their fingerprint see -->
+    <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
+
+    <!-- ActiveSteps may vibrate the phone on start and on finish -->
+    <!-- Apps should include this if you want ActiveSteps to vibrate -->
+    <!-- <uses-permission android:name="android.permission.VIBRATE"/> -->
+
+    <!-- Used to track location updates for walking tasks to get length walked, speed, etc -->
+    <!-- Apps should include this in their main AndroidManifest.xml if using location walking tasks -->
+    <!--<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />-->
+    <!--<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />-->
+
+    <!-- Needs to be added if your app uses an task with AudioStep -->
+    <!--<uses-permission android:name="android.permission.RECORD_AUDIO" /> -->
+
+</manifest>
diff --git a/...va/org/researchstack/skin/ActionItem.java → ...rg/researchstack/backbone/ActionItem.java b/...va/org/researchstack/skin/ActionItem.java → ...rg/researchstack/backbone/ActionItem.java
@@ -1,4 +1,4 @@
-package org.researchstack.skin;
+package org.researchstack.backbone;
 
 import android.view.MenuItem;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		connection.project.dir=..
		eclipse.preferences.version=1