Merge pull request #17 from AdamMc331/remove_core

Remove core
AdamMc331 · Mar 17, 2019 · 159b624 · 159b624
2 parents b038f43 + 20fda61
commit 159b624
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 311 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,7 +26,8 @@ allprojects {
         minSdkVersion = 21
         targetSdkVersion = 28
         buildToolsVersion = '28.0.3'
-        jetpackVersion = '1.0.0'
+        appCompatVersion = '1.0.2'
+        materialVersion = '1.0.0'
         lifecycleVersion = '2.0.0'
         constraintLayoutVersion = '2.0.0-alpha3'
         mockitoVersion = '2.23.0'

diff --git a/core/.gitignore b/core/.gitignore
diff --git a/core/README.md b/core/README.md
diff --git a/core/build.gradle b/core/build.gradle
diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseAddTaskActivity.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseAddTaskActivity.kt
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseTask.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseTask.kt
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseTaskAdapter.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseTaskAdapter.kt
diff --git a/core/src/main/java/com/adammcneilly/todo_core/BaseTaskListActivity.kt b/core/src/main/java/com/adammcneilly/todo_core/BaseTaskListActivity.kt
diff --git a/core/src/main/res/drawable/ic_add_white_24dp.xml b/core/src/main/res/drawable/ic_add_white_24dp.xml
diff --git a/core/src/main/res/layout/activity_add_task.xml b/core/src/main/res/layout/activity_add_task.xml
diff --git a/core/src/main/res/layout/activity_task_list.xml b/core/src/main/res/layout/activity_task_list.xml
diff --git a/core/src/main/res/layout/list_item_task.xml b/core/src/main/res/layout/list_item_task.xml
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':todo-mvp', ':todo-mvvm', ':core'
+include ':todo-mvp', ':todo-mvvm'
diff --git a/todo-mvp/build.gradle b/todo-mvp/build.gradle
@@ -25,9 +25,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$jetpackVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
-    implementation "com.google.android.material:material:$jetpackVersion"
+    implementation "com.google.android.material:material:$materialVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"
     testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:$mockitoKotlinVersion"
     testImplementation "junit:junit:$junitVersion"

diff --git a/todo-mvvm/build.gradle b/todo-mvvm/build.gradle
@@ -28,9 +28,9 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "androidx.appcompat:appcompat:$jetpackVersion"
+    implementation "androidx.appcompat:appcompat:$appCompatVersion"
     implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
-    implementation "com.google.android.material:material:$jetpackVersion"
+    implementation "com.google.android.material:material:$materialVersion"
     implementation "androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
     implementation "androidx.arch.core:core-testing:$lifecycleVersion"
     testImplementation "org.mockito:mockito-core:$mockitoVersion"