Dependency versions bump: (#38)

* Dependency versions bump: - kotlin to 1.4.10 - AGP to 4.2.0-alpha12 - Chucker to 3.3.0 * Add multidex to sample project * Update Gemfile
DroidsOnRoids · Oct 1, 2020 · eca58e4 · eca58e4
1 parent d4a23d1
commit eca58e4
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -13,15 +13,15 @@ GEM
     colored2 (3.1.2)
     cork (0.3.0)
       colored2 (~> 3.1)
-    danger (8.0.4)
+    danger (8.0.5)
       claide (~> 1.0)
       claide-plugins (>= 0.9.2)
       colored2 (~> 3.1)
       cork (~> 0.1)
       faraday (>= 0.9.0, < 2.0)
       faraday-http-cache (~> 2.0)
       git (~> 1.7)
-      kramdown (~> 2.0)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       no_proxy_fix
       octokit (~> 4.7)
@@ -53,7 +53,7 @@ GEM
       ast
       ruby-ll (~> 2.1)
     open4 (1.3.4)
-    public_suffix (4.0.5)
+    public_suffix (4.0.6)
     rchardet (1.8.0)
     rexml (3.2.4)
     ruby-ll (2.1.2)

diff --git a/build.gradle b/build.gradle
@@ -3,18 +3,19 @@ buildscript {
             minSdk             : 16,
             compileSdk         : 30,
             targetSdk          : 30,
-            kotlin             : '1.4.0',
-            androidGradlePlugin: '4.2.0-alpha07',
+            kotlin             : '1.4.10',
+            androidGradlePlugin: '4.2.0-alpha12',
             versionsPlugin     : '0.29.0',
             hyperion           : '0.9.29',
             debugDb            : '1.0.6',
-            chucker            : '3.2.0',
+            chucker            : '3.3.0',
             hyperionAppInfo    : '1.1.0',
             deviceNames        : '2.0.0',
             autoService        : '1.0-rc7',
             shipkit            : '2.3.0',
             detekt             : '1.11.1',
-            androidxAnnotations: '1.2.0-alpha01'
+            androidxAnnotations: '1.2.0-alpha01',
+            multidex           : '2.0.1',
     ]
 
     repositories {

diff --git a/chucker_plugin/src/main/java/pl/droidsonroids/foqa/chucker/ChuckerPlugin.kt b/chucker_plugin/src/main/java/pl/droidsonroids/foqa/chucker/ChuckerPlugin.kt
@@ -18,7 +18,7 @@ internal class ChuckerModule : PluginModule() {
     override fun createPluginView(layoutInflater: LayoutInflater, parent: ViewGroup): View {
         val view = layoutInflater.inflate(R.layout.foqa_chucker_menu_item, parent, false)
         view.setOnClickListener {
-            it.context.startActivity(Chucker.getLaunchIntent(it.context, Chucker.SCREEN_HTTP))
+            it.context.startActivity(Chucker.getLaunchIntent(it.context))
         }
         return view
     }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-rc-3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -6,6 +6,7 @@ android {
         applicationId 'pl.droidsonroids.foqa.sample'
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
+        multiDexEnabled true
     }
 
     lintOptions {
@@ -22,4 +23,5 @@ android {
 
 dependencies {
     implementation project(':foqa')
+    implementation "androidx.multidex:multidex:$versions.multidex"
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -4,6 +4,7 @@
     package="pl.droidsonroids.foqa.sample">
 
     <application
+        android:name="androidx.multidex.MultiDexApplication"
         android:allowBackup="true"
         android:supportsRtl="true"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,MissingApplicationIcon">