From f5cc0edf40e46367574db01c21b14938c5fae593 Mon Sep 17 00:00:00 2001
From: Lucas Lima <me@lucasnlm.dev>
Date: Fri, 17 Apr 2020 09:12:08 -0300
Subject: [PATCH 1/3] Bump verions

---
 app/build.gradle    | 4 ++--
 common/build.gradle | 4 ++--
 config.gradle       | 4 ++--
 foss/build.gradle   | 4 ++--
 wear/build.gradle   | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd99d6ce..2b0306fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 603001
-        versionName '6.3.0'
+        versionCode 603011
+        versionName '6.3.1'
         applicationId buildVersion.applicationId
         minSdkVersion buildVersion.minAppSdk
         targetSdkVersion buildVersion.targetSdk
diff --git a/common/build.gradle b/common/build.gradle
index 1b2e1e29..26e06b66 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -8,8 +8,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 603001
-        versionName '6.3.0'
+        versionCode 603011
+        versionName '6.3.1'
         minSdkVersion buildVersion.minAppSdk
         targetSdkVersion buildVersion.targetSdk
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/config.gradle b/config.gradle
index d1926f1f..12cd02a5 100644
--- a/config.gradle
+++ b/config.gradle
@@ -1,6 +1,6 @@
 ext.buildVersion = [
-        versionCode  : 603001, // MMmmPPv
-        versionName  : '6.3.0',
+        versionCode  : 603011, // MMmmPPv
+        versionName  : '6.3.1',
         targetSdk    : 29,
         minAppSdk    : 16,
         wearMinAppSdk: 23,
diff --git a/foss/build.gradle b/foss/build.gradle
index 608cbf02..a0ced7fa 100644
--- a/foss/build.gradle
+++ b/foss/build.gradle
@@ -6,10 +6,10 @@ android {
     compileSdkVersion buildVersion.targetSdk
 
     defaultConfig {
+        versionCode  : 603011 // MMmmPPv
+        versionName  : '6.3.1'
         minSdkVersion buildVersion.minAppSdk
         targetSdkVersion buildVersion.targetSdk
-        versionCode buildVersion.versionCode
-        versionName buildVersion.versionName
         resConfigs 'en', 'cs', 'de', 'es', 'fr', 'pt', 'ru', 'tr', 'vi', 'uk', 'zh'
     }
 
diff --git a/wear/build.gradle b/wear/build.gradle
index 60b80a03..4c429d3c 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -9,8 +9,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 603001
-        versionName '6.3.0'
+        versionCode 603011
+        versionName '6.3.1'
         applicationId buildVersion.applicationId
         minSdkVersion buildVersion.wearMinAppSdk
         targetSdkVersion buildVersion.targetSdk

From 6e9ee310586349c33be3f98325fcec91161636f1 Mon Sep 17 00:00:00 2001
From: Lucas Lima <me@lucasnlm.dev>
Date: Fri, 17 Apr 2020 09:24:55 -0300
Subject: [PATCH 2/3] Remove gradle extra params

---
 .github/workflows/android.yml | 2 +-
 foss/build.gradle             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index fb4acee3..0b911002 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -25,7 +25,7 @@ jobs:
       with:
         java-version: 1.8
     - name: Unit tests
-      run: bash ./gradlew -i -d test --stacktrace
+      run: bash ./gradlew test --stacktrace
 
   build:
     runs-on: ubuntu-latest
diff --git a/foss/build.gradle b/foss/build.gradle
index a0ced7fa..f8c8163e 100644
--- a/foss/build.gradle
+++ b/foss/build.gradle
@@ -6,8 +6,8 @@ android {
     compileSdkVersion buildVersion.targetSdk
 
     defaultConfig {
-        versionCode  : 603011 // MMmmPPv
-        versionName  : '6.3.1'
+        versionCode 603011 // MMmmPPv
+        versionName '6.3.1'
         minSdkVersion buildVersion.minAppSdk
         targetSdkVersion buildVersion.targetSdk
         resConfigs 'en', 'cs', 'de', 'es', 'fr', 'pt', 'ru', 'tr', 'vi', 'uk', 'zh'

From 99f2241b7c858fdfaa66ca3e7ef9be025313ee08 Mon Sep 17 00:00:00 2001
From: Lucas Lima <me@lucasnlm.dev>
Date: Fri, 17 Apr 2020 09:31:17 -0300
Subject: [PATCH 3/3] Remove generateStubs

---
 app/build.gradle    | 4 ----
 common/build.gradle | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 2b0306fa..651580c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,10 +39,6 @@ android {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
 
-    kapt {
-        generateStubs true
-    }
-
     testOptions {
         unitTests {
             includeAndroidResources true
diff --git a/common/build.gradle b/common/build.gradle
index 26e06b66..b0a5451a 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -14,10 +14,6 @@ android {
         targetSdkVersion buildVersion.targetSdk
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
     }
-
-    kapt {
-        generateStubs true
-    }
 }
 
 dependencies {