diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..a8e3ce4 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,58 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/2.0/configuration-reference +# For a detailed guide to building and testing on Android, read the docs: +# https://circleci.com/docs/2.0/language-android/ for more details. +version: 2.1 + +# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects. +# See: https://circleci.com/docs/2.0/orb-intro/ +orbs: + android: circleci/android@1.0.3 + +# Define a job to be invoked later in a workflow. +# See: https://circleci.com/docs/2.0/configuration-reference/#jobs +jobs: + # Below is the definition of your job to build and test your app, you can rename and customize it as you want. + build-and-test: + # These next lines define the Android machine image executor. + # See: https://circleci.com/docs/2.0/executor-types/ + executor: + name: android/android-machine + + # Add steps to the job + # See: https://circleci.com/docs/2.0/configuration-reference/#steps + steps: + # Checkout the code as the first step. + - checkout + # Setup files for build. + - run: + name: Setup variables for build + command: | + echo "$GOOGLE_SERVICES_KEY" > "app/google-services.json" + # echo "$RELEASE_KEYSTORE_BASE64" | base64 --decode > "android/app/release_keystore.jks" + - run: + name: Grant execute permission for gradlew + command: | + chmod +x gradlew + # The next step will run the unit tests + - android/run-tests: + test-command: ./gradlew testDriverDebugUnitTest --continue + +# Then start the emulator and run the Instrumentation tests! +# - android/start-emulator-and-run-tests: +# test-command: ./gradlew connectedDebugAndroidTest +# system-image: system-images;android-25;google_apis;x86 + + # And finally run the release build +# - run: +# name: Assemble release build +# command: | +# ./gradlew assembleDriverRelease + +# Invoke jobs via workflows +# See: https://circleci.com/docs/2.0/configuration-reference/#workflows +workflows: + sample: # This is the name of the workflow, feel free to change it to better match your workflow. + # Inside the workflow, you define the jobs you want to run. + jobs: + - build-and-test diff --git a/.gitignore b/.gitignore index c241fbd..77d1098 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ /.idea/modules.xml /.idea/workspace.xml /.idea/navEditor.xml +/.idea/misc.xml +/.idea/assetWizardSettings.xml .DS_Store /build /captures diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml index 3cc336b..88ea3aa 100644 --- a/.idea/codeStyles/Project.xml +++ b/.idea/codeStyles/Project.xml @@ -1,22 +1,6 @@ - - diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..b589d56 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/dictionaries/h_mal.xml b/.idea/dictionaries/h_mal.xml new file mode 100644 index 0000000..a2afb5c --- /dev/null +++ b/.idea/dictionaries/h_mal.xml @@ -0,0 +1,7 @@ + + + + viewmodel + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 5cd135a..66ff961 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,16 +4,16 @@ diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..2c4abab --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index ff143d4..22b30ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -23,7 +23,7 @@ android { defaultConfig { applicationId "h_mal.appttude.com" minSdkVersion 24 - targetSdkVersion 30 + targetSdkVersion 31 versionCode 6 versionName "1.6" testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner' @@ -34,13 +34,14 @@ android { storePassword relStorePassword keyPassword relKeyPassword keyAlias relKeyAlias - storeFile file(relStoreFile) +// storeFile file(relStoreFile) } } buildTypes { release { - signingConfig signingConfigs.release +// signingConfig signingConfigs.release + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/app/google-services.json b/app/google-services.json deleted file mode 100644 index 14913b0..0000000 --- a/app/google-services.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "project_info": { - "project_number": "311398117829", - "firebase_url": "https://driver-8f4a1.firebaseio.com", - "project_id": "driver-8f4a1", - "storage_bucket": "driver-8f4a1.appspot.com" - }, - "client": [ - { - "client_info": { - "mobilesdk_app_id": "1:311398117829:android:cd8a17ae21224023", - "android_client_info": { - "package_name": "h_mal.appttude.com.driver" - } - }, - "oauth_client": [ - { - "client_id": "311398117829-ma5nflm7hviakaq16o2r0pubce6ar4rn.apps.googleusercontent.com", - "client_type": 3 - } - ], - "api_key": [ - { - "current_key": "AIzaSyDGShfTzdvwsoYOqtb5pwcnxPxec9u9f8Y" - } - ], - "services": { - "analytics_service": { - "status": 1 - }, - "appinvite_service": { - "status": 1, - "other_platform_oauth_client": [] - }, - "ads_service": { - "status": 2 - } - } - } - ], - "configuration_version": "1" -} \ No newline at end of file diff --git a/app/src/test/java/h_mal/appttude/com/driver/ExampleUnitTest.java b/app/src/testDebug/java/driver/ExampleUnitTest.java similarity index 90% rename from app/src/test/java/h_mal/appttude/com/driver/ExampleUnitTest.java rename to app/src/testDebug/java/driver/ExampleUnitTest.java index 66de00b..8be5855 100644 --- a/app/src/test/java/h_mal/appttude/com/driver/ExampleUnitTest.java +++ b/app/src/testDebug/java/driver/ExampleUnitTest.java @@ -1,9 +1,9 @@ -package h_mal.appttude.com.driver; - -import org.junit.Test; +package driver; import static org.junit.Assert.assertEquals; +import org.junit.Test; + /** * Example local unit test, which will execute on the development machine (host). *