Merge pull request #209 from ToxicBakery/feature/gradle_plugin_support_lib_update

Feature/gradle plugin support lib update

Author: Sean Amos

build.gradle

@@ -1,14 +1,20 @@
-project.ext.set("compileSdkVersion", 27)
+project.ext.set("compileSdkVersion", 28)
 project.ext.set("buildToolsVersion", "28.0.3")
 project.ext.set("minSdkVersion", 15)
-project.ext.set("targetSdkVersion", 27)
+project.ext.set("targetSdkVersion", 28)
 
 project.ext.set("libraryGroup", 'com.willowtreeapps.hyperion')
 project.ext.set("libraryVersion", '0.9.29')
 
-project.ext.set("versionSupportLibrary", "27.1.1")
 project.ext.set("versionAutoService", "1.0-rc4")
-project.ext.set("versionDagger", "2.15")
+project.ext.set("versionDagger", "2.24")
+project.ext.set("versionRecyclerView", "1.1.0")
+project.ext.set("versionAppCompat", "1.2.0")
+project.ext.set("versionConstraintLayout", "1.1.3")
+project.ext.set("versionMaterial", "1.0.0")
+project.ext.set("versionMultidex", "2.0.1")
+project.ext.set("versionSlidingPanelLayout", "1.1.0")
+project.ext.set("versionSwipeRefreshLayout", "1.1.0")
 
 buildscript {
 
@@ -18,7 +24,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath 'digital.wup:android-maven-publish:3.6.2'
     }
 }

gradle.properties

@@ -16,4 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 org.gradle.parallel=true
 # enable after fix https://github.com/gradle/gradle/issues/4848
-org.gradle.configureondemand=false
+org.gradle.configureondemand=false
+android.useAndroidX=true
+android.enableJetifier=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 14 16:58:08 CDT 2019
+#Thu May 09 15:48:22 EDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

hyperion-attr-appcompat-v7/build.gradle

@@ -13,7 +13,7 @@ android {
         versionCode buildVersionCode()
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
@@ -28,7 +28,7 @@ dependencies {
     compileOnly project(':hyperion-plugin')
     compileOnly project(':hyperion-attr')
     annotationProcessor "com.google.auto.service:auto-service:${project.versionAutoService}"
-    implementation "com.android.support:appcompat-v7:${project.versionSupportLibrary}"
+    implementation "androidx.appcompat:appcompat:${project.versionAppCompat}"
 }
 
 apply from: '../publish.gradle'

hyperion-attr-appcompat-v7/src/main/java/com/willowtreeapps/hyperion/attr/support/v7/ActionMenuViewAttributeCollector.java

@@ -1,7 +1,7 @@
 package com.willowtreeapps.hyperion.attr.support.v7;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.ActionMenuView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ActionMenuView;
 
 import com.google.auto.service.AutoService;
 import com.willowtreeapps.hyperion.attr.ViewAttribute;

hyperion-attr-appcompat-v7/src/main/java/com/willowtreeapps/hyperion/attr/support/v7/SearchViewAttributeCollector.java

@@ -1,7 +1,7 @@
 package com.willowtreeapps.hyperion.attr.support.v7;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.SearchView;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
 
 import com.google.auto.service.AutoService;
 import com.willowtreeapps.hyperion.attr.ViewAttribute;

hyperion-attr-appcompat-v7/src/main/java/com/willowtreeapps/hyperion/attr/support/v7/ToolbarAttributeCollector.java

@@ -1,7 +1,7 @@
 package com.willowtreeapps.hyperion.attr.support.v7;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 
 import com.google.auto.service.AutoService;
 import com.willowtreeapps.hyperion.attr.ViewAttribute;

hyperion-attr-design/build.gradle

@@ -13,7 +13,7 @@ android {
         versionCode buildVersionCode()
         versionName version
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     lintOptions {
@@ -27,7 +27,7 @@ dependencies {
     compileOnly project(':hyperion-plugin')
     compileOnly project(':hyperion-attr')
     annotationProcessor "com.google.auto.service:auto-service:${project.versionAutoService}"
-    implementation "com.android.support:design:${project.versionSupportLibrary}"
+    implementation "com.google.android.material:material:${project.versionMaterial}"
 }
 
 apply from: '../publish.gradle'

hyperion-attr-design/src/main/java/com/willowtreeapps/hyperion/attr/design/AppBarLayoutAttributeCollector.java

@@ -1,7 +1,7 @@
 package com.willowtreeapps.hyperion.attr.design;
 
-import android.support.annotation.NonNull;
-import android.support.design.widget.AppBarLayout;
+import androidx.annotation.NonNull;
+import com.google.android.material.appbar.AppBarLayout;
 
 import com.google.auto.service.AutoService;
 import com.willowtreeapps.hyperion.attr.collectors.TypedAttributeCollector;

hyperion-attr-design/src/main/java/com/willowtreeapps/hyperion/attr/design/BottomNavigationViewAttributeCollector.java

@@ -2,8 +2,8 @@
 
 import android.content.Context;
 import android.content.res.Resources;
-import android.support.annotation.NonNull;
-import android.support.design.widget.BottomNavigationView;
+import androidx.annotation.NonNull;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
 
 import com.google.auto.service.AutoService;
 import com.willowtreeapps.hyperion.attr.ViewAttribute;