chore(api): Apply lints (#812)

* Clean up pinpoint

* Clean up pinpoint dart

* Update iOS script

* Update CI order

* Add Dart lints to API

* Apply Android/iOS lints to API

* Rename uuid

* Small changes

* Fix scripts

* Clean up

* Fix unit tests

* Continue impl

* Fix android unit tests

* Remove duplicate lint check

* Fix analytics app

* Adjust java options

* Bump java RAM

* Remove concurrency

* Disable gradle daemon

* Update gradle properties

* Update gradle config

* Revert "Update gradle config"

This reverts commit a43ad29.

* Revert gradle changes

* Disable gradle daemon

* Add kotlin style flags

* Disable gradle daemon

* Bump JVM memory

* Change daemon setting

* Adjust JVM memory

* Lint debug only

* Fix API tests

* Bump deps and fix coverage script

* Fix Gradle version

* Revert unnecessary changes

* Update melos postclean files

* Enable fatal infos

* Fix analyze scope

* Fix postbootstrap

* Fix missing sample app

* Fix order in CI

* Revert add sample app

* Revert order change

* Revert license date

* Revert "Revert license date"

This reverts commit 1b93b3f.

Author: dnys1

build-support/dependencies.rb

@@ -1,6 +1,38 @@
+$swift_version = "5.0"
+
 # Include common tooling
 def include_build_tools!
     # Pin to 0.44.17 until we resolve closing braces
     pod 'SwiftFormat/CLI', '0.44.17'
     pod 'SwiftLint'
 end
+
+$lint_script = <<-EOF
+    CONFIG_FILE="${SRCROOT}/../../../../../.swiftformat"
+    if [[ -e "${CONFIG_FILE}" ]]; then
+        "${PODS_ROOT}/SwiftFormat/CommandLineTool/swiftformat" --config "${CONFIG_FILE}" --swiftversion "#{$swift_version}" "${SRCROOT}/../.symlinks/plugins/${PRODUCT_NAME}/ios"
+    fi 
+EOF
+
+$format_script = <<-EOF
+    CONFIG_FILE="${SRCROOT}/../../../../../.swiftlint.yml"
+    if [[ -e "${CONFIG_FILE}" ]]; then 
+        "${PODS_ROOT}/SwiftLint/swiftlint" --config "${CONFIG_FILE}" --path "${SRCROOT}/../.symlinks/plugins/${PRODUCT_NAME}/ios"
+    fi
+EOF
+
+$default_script_phases = [
+    # Format build phase
+    {
+        :name => 'SwiftFormat',
+        :script => $lint_script,
+        :execution_position => :before_compile
+    },
+
+    # Lint build phase
+    {
+        :name => 'SwiftLint',
+        :script => $format_script,
+        :execution_position => :before_compile
+    },
+]

build-support/lint_android.sh

@@ -1,6 +1,19 @@
 #!/bin/bash
 
+set -euo pipefail
+
+# Script is run from example/ folder. 
+# Pop up a dir to get the package we're testing.
+pushd ..
+project=$(basename $PWD)
+popd
+
 cd android
 
 # Run in background to prevent Melos from hanging
-./gradlew lint --quiet --console plain &
+./gradlew :$project:lintDebug --no-rebuild --no-daemon --stacktrace &
+gradle_pid=$!
+
+if ! wait $gradle_pid; then
+    exit 1
+fi

build-support/lint_ios.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ -z "$AMPLIFY_FLUTTER_ROOT" ]; then
     echo "Must set AMPLIFY_FLUTTER_ROOT" >&2
     exit 1

example/android/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+
+# (nydillon) Must be <=6.1.1 until this issue is resolved: https://github.com/gradle/gradle/issues/14132
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

melos.yaml

@@ -10,7 +10,7 @@ scripts:
     flutter pub global activate tuneup
 
   copy_dummy_config: >
-    melos exec --scope="*example*" --fail-fast -- \
+    melos exec --scope="*example*,sample_app" -- \
       cp -n "\$MELOS_ROOT_PATH"/.circleci/dummy_amplifyconfiguration.dart lib/amplifyconfiguration.dart | true
 
   build:examples:ios: >
@@ -68,12 +68,13 @@ scripts:
 
   analyze:
     run: melos exec -c 1 --fail-fast -- \
-      flutter analyze --no-fatal-infos
+      flutter analyze
     description: >
       Analyzes all packages and fails if there are any errors.
     select-package:
       scope:
         - amplify_analytics_*
+        - amplify_api*
 
   lint:ios:
     run: |
@@ -86,6 +87,7 @@ scripts:
       dir-exists: ios
       scope:
         - amplify_analytics_pinpoint_example
+        - amplify_api_example
 
   lint:android:
     run: |
@@ -96,17 +98,23 @@ scripts:
     select-package:
       scope:
         - amplify_analytics_pinpoint_example
+        - amplify_api_example
 
   lint:pub: >
     melos exec -c 5 --fail-fast --no-private --ignore="*example*" -- \
       flutter pub publish --dry-run
 
-  postbootstrap: >
-    melos run copy_dummy_config
+  packages:fix: |
+    melos exec -- \
+      flutter analyze --no-fatal-infos --no-fatal-warnings >/dev/null 2>&1
+
+  postbootstrap: |
+    melos run copy_dummy_config && \
+    melos run packages:fix
 
   postclean: >
     melos exec -- \
-      rm -rf ./build ./android/.gradle ./ios/.symlinks ./ios/Pods ./android/.idea ./.idea
+      rm -rf ./build ./android/.gradle ./ios/.symlinks ./ios/Pods ./ios/Podfile.lock
 
 dev_dependencies:
   pedantic: ^1.9.0

packages/amplify_analytics_pinpoint/android/build.gradle

@@ -39,10 +39,13 @@ android {
     }
     lintOptions {
         disable 'InvalidPackage'
-        disable 'GradleDependency'
+        informational 'GradleDependency'
 
         abortOnError true
         warningsAsErrors true
+        checkTestSources true
+        xmlReport false
+        htmlReport false
     }
     testOptions {
         unitTests {
@@ -66,9 +69,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'com.amplifyframework:aws-analytics-pinpoint:1.24.1'
     implementation 'com.amplifyframework:aws-auth-cognito:1.24.1'
-    testImplementation 'junit:junit:4.13'
-    testImplementation 'org.mockito:mockito-core:3.1.0'
-    testImplementation 'org.mockito:mockito-inline:3.1.0'
-    testImplementation 'androidx.test:core:1.2.0'
+    testImplementation 'junit:junit:4.13.2'
+    testImplementation 'org.mockito:mockito-core:3.10.0'
+    testImplementation 'org.mockito:mockito-inline:3.10.0'
+    testImplementation 'androidx.test:core:1.4.0'
     testImplementation 'org.robolectric:robolectric:4.3.1'
 }

packages/amplify_analytics_pinpoint/android/coverage.gradle

@@ -97,11 +97,9 @@ project.afterEvaluate {
                     def variantSourceSets = variant.sourceSets.java.srcDirs.collect { it.path }.flatten()
                     sourceDirectories.setFrom(project.files(variantSourceSets))
 
-                    def androidTestsData = fileTree(dir: "${buildDir}/outputs/code_coverage/${variantName}AndroidTest/connected/", includes: ["**/*.ec"])
-
-                    executionData(files([
-                            "$project.buildDir/jacoco/${unitTestTask}.exec",
-                            androidTestsData
+                    executionData(fileTree(dir: "$buildDir", includes: [
+                            "jacoco/${unitTestTask}.exec",
+                            "outputs/code_coverage/${variantName}AndroidTest/connected/*coverage.ec"
                     ]))
                 }
 

packages/amplify_analytics_pinpoint/android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,6 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip
+
+# (nydillon) Must be <=6.1.1 until this issue is resolved: https://github.com/gradle/gradle/issues/14132
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

packages/amplify_analytics_pinpoint/android/src/main/kotlin/com/amazonaws/amplify/amplify_analytics_pinpoint/AmplifyAnalyticsBuilder.kt

@@ -23,7 +23,7 @@ import com.amplifyframework.analytics.UserProfile
 class AmplifyAnalyticsBuilder {
     companion object Builder {
 
-        fun createAnalyticsProperties(propertiesMap: HashMap<String, Any>): AnalyticsProperties {
+        fun createAnalyticsProperties(propertiesMap: Map<String, Any>): AnalyticsProperties {
 
             val propertiesBuilder: AnalyticsProperties.Builder = AnalyticsProperties.builder()
 
@@ -54,7 +54,7 @@ class AmplifyAnalyticsBuilder {
 
         fun createAnalyticsEvent(
             name: String,
-            propertiesMap: HashMap<String, Any>
+            propertiesMap: Map<String, Any>
         ): AnalyticsEvent {
 
             val eventBuilder: AnalyticsEvent.Builder = AnalyticsEvent.builder()
@@ -85,7 +85,7 @@ class AmplifyAnalyticsBuilder {
             return eventBuilder.build()
         }
 
-        fun createUserProfile(userProfileMap: HashMap<String, *>): UserProfile {
+        fun createUserProfile(userProfileMap: Map<String, Any>): UserProfile {
 
             val userProfileBuilder = UserProfile.builder()
 
@@ -118,7 +118,7 @@ class AmplifyAnalyticsBuilder {
             return userProfileBuilder.build()
         }
 
-        private fun createUserLocation(userLocationMap: HashMap<String, *>): UserProfile.Location {
+        private fun createUserLocation(userLocationMap: Map<String, Any?>): UserProfile.Location {
 
             val locationBuilder = UserProfile.Location.builder()