From 40566675157a5f53402eb0121bb1b0a5740204a8 Mon Sep 17 00:00:00 2001 From: adammc331 Date: Sun, 15 May 2022 15:41:59 -0400 Subject: [PATCH 1/5] Updating gems. --- Dangerfile | 31 +++++++++++++++++++++++++++- Gemfile.lock | 58 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 71 insertions(+), 18 deletions(-) diff --git a/Dangerfile b/Dangerfile index 573a20a..7077090 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1 +1,30 @@ -message("Thanks @#{github.pr_author}!") \ No newline at end of file +if github.pr_body.length == 0 + fail "Please provide a summary in the Pull Request description." +end + +if git.lines_of_code > 500 + warn "Please consider breaking up this pull request." +end + +if github.pr_labels.empty? + warn "Please add labels to this PR." +end + +if git.deletions > git.insertions + message "🎉 Code Cleanup!" +end + +# Notify of outdated dependencies +dependencyUpdatesHeader = "The following dependencies have later milestone versions:" +dependencyReportsFile = "app/build/dependencyUpdates/report.txt" + +# Due to the formatting of this output file, we first check if there are any dependencies +# by looking for a `->` arrow, then we check for the relevant headers. We do this to handle a case +# where there are no app dependencies but there are Gradle dependencies. +hasDependencyUpdatesHeader = File.readlines(dependencyReportsFile).grep(/#{dependencyUpdatesHeader}/).any? + +if hasDependencyUpdatesHeader + file = File.open(dependencyReportsFile, "rb").read + index = file.index(dependencyUpdatesHeader) + message file.slice(index..-1) +end \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index de79639..a16ac1e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) - claide (1.0.3) + claide (1.1.0) claide-plugins (0.9.2) cork nap @@ -11,43 +11,67 @@ GEM colored2 (3.1.2) cork (0.3.0) colored2 (~> 3.1) - danger (6.2.0) + danger (8.6.1) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) cork (~> 0.1) - faraday (~> 0.9) + faraday (>= 0.9.0, < 2.0) faraday-http-cache (~> 2.0) - git (~> 1.5) - kramdown (~> 2.0) + git (~> 1.7) + kramdown (~> 2.3) kramdown-parser-gfm (~> 1.0) no_proxy_fix octokit (~> 4.7) - terminal-table (~> 1) - faraday (0.17.3) + terminal-table (>= 1, < 4) + faraday (1.10.0) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-http-cache (2.2.0) + faraday (>= 0.8) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.3) multipart-post (>= 1.2, < 3) - faraday-http-cache (2.0.0) - faraday (~> 0.8) - git (1.5.0) - kramdown (2.3.1) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + git (1.11.0) + rchardet (~> 1.8) + kramdown (2.4.0) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) multipart-post (2.1.1) nap (1.1.0) no_proxy_fix (0.1.2) - octokit (4.15.0) + octokit (4.22.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) open4 (1.3.4) - public_suffix (4.0.6) - rexml (3.2.4) + public_suffix (4.0.7) + rchardet (1.8.0) + rexml (3.2.5) + ruby2_keywords (0.0.5) sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) - unicode-display_width (1.6.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.1.0) PLATFORMS ruby From 4ca7df6a4b694485788b410ce05a4ee3262331db Mon Sep 17 00:00:00 2001 From: adammc331 Date: Sun, 15 May 2022 15:54:07 -0400 Subject: [PATCH 2/5] AGP update. --- Dangerfile | 2 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dangerfile b/Dangerfile index 7077090..706936f 100644 --- a/Dangerfile +++ b/Dangerfile @@ -16,7 +16,7 @@ end # Notify of outdated dependencies dependencyUpdatesHeader = "The following dependencies have later milestone versions:" -dependencyReportsFile = "app/build/dependencyUpdates/report.txt" +dependencyReportsFile = "build/dependencyUpdates/report.txt" # Due to the formatting of this output file, we first check if there are any dependencies # by looking for a `->` arrow, then we check for the relevant headers. We do this to handle a case diff --git a/build.gradle b/build.gradle index 55e4e30..f3b3443 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ apply plugin: "io.gitlab.arturbosch.detekt" buildscript { ext.kotlin_version = "1.4.32" - ext.build_tools_version = '7.0.0-alpha14' + ext.build_tools_version = '7.0.4' ext.compose_version = '1.0.0-beta05' repositories { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3bedf4a..64c1f01 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-rc-1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip From 47ac1e9ccf54a304dc526b7534959d428f69e065 Mon Sep 17 00:00:00 2001 From: adammc331 Date: Sun, 15 May 2022 16:04:31 -0400 Subject: [PATCH 3/5] Updating Compose & Kotlin versions. --- app/build.gradle | 2 +- build.gradle | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a26adf6..c224cd5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,7 +67,7 @@ android { composeOptions { kotlinCompilerExtensionVersion compose_version - kotlinCompilerVersion '1.4.30' + kotlinCompilerVersion kotlin_version } } diff --git a/build.gradle b/build.gradle index f3b3443..3997533 100644 --- a/build.gradle +++ b/build.gradle @@ -4,9 +4,9 @@ apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: "io.gitlab.arturbosch.detekt" buildscript { - ext.kotlin_version = "1.4.32" + ext.kotlin_version = "1.6.10" ext.build_tools_version = '7.0.4' - ext.compose_version = '1.0.0-beta05' + ext.compose_version = '1.1.1' repositories { jcenter() @@ -38,7 +38,7 @@ allprojects { androidTargetSdkVersion = 29 androidCompileSdkVersion = 29 - appCompatVersion = "1.2.0" + appCompatVersion = "1.4.1" lifecycleVersion = "2.3.1" coroutinesVersion = "1.4.3" architectureComponentsVersion = "2.1.0" From bc097169213234c58f68ea9e4760884447b2523f Mon Sep 17 00:00:00 2001 From: adammc331 Date: Sun, 15 May 2022 18:05:12 -0400 Subject: [PATCH 4/5] Compile 31? --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3997533..d7090ff 100644 --- a/build.gradle +++ b/build.gradle @@ -35,8 +35,8 @@ allprojects { ext { androidMinSdkVersion = 21 - androidTargetSdkVersion = 29 - androidCompileSdkVersion = 29 + androidTargetSdkVersion = 31 + androidCompileSdkVersion = 31 appCompatVersion = "1.4.1" lifecycleVersion = "2.3.1" From f1a7b977d2f1bd6d43bd0e1c2866d952c1331af9 Mon Sep 17 00:00:00 2001 From: adammc331 Date: Sun, 15 May 2022 18:16:05 -0400 Subject: [PATCH 5/5] Bumping room version and using exported property. --- .idea/codeStyles/Project.xml | 9 --------- app/src/main/AndroidManifest.xml | 1 + database/build.gradle | 2 +- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index a8bb610..582b64c 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -4,15 +4,6 @@ -