Skip to content

Commit

Permalink
Merge branch 'qa'
Browse files Browse the repository at this point in the history
  • Loading branch information
alexosugo committed Sep 27, 2021
2 parents 7895759 + 0bf6981 commit 6d61c44
Show file tree
Hide file tree
Showing 116 changed files with 5,024 additions and 2,359 deletions.
173 changes: 74 additions & 99 deletions .github/workflows/prod-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,105 +7,80 @@ on:
# Triggers the workflow on push events to the specified branch
push:
branches: [ master ]
tags:
- 'v*'

## Define jobs to be run sequentially or parallel
#jobs:
# # First job to be run called "build"
# build:
# # The type of runner the job will run on
# runs-on: ubuntu-latest
#
# # Sequence of tasks that will be executed as part of the job
# steps:
#
# # Checkout the repository so that the job can access it
# - name: checkout
# uses: actions/checkout@v2
#
#
# # Set up our gradle properties for access by the Android build
# - name: set up gradle properties
# env:
# HoverUsername: ${{ secrets.HOVER_USERNAME }}
# HoverPassword: ${{ secrets.HOVER_PASSWORD }}
# shell: bash
# run: |
# mkdir ~/.gradle
# echo "GRADLE_USER_HOME=$HOME/.gradle" >> $GITHUB_ENV
# echo "HoverUsername=$HoverUsername" >> ~/.gradle/gradle.properties
# echo "HoverPassword=$HoverPassword" >> ~/.gradle/gradle.properties
#
#
# # Set up JDK 1.8 for use
# - name: set up JDK 1.8
# uses: actions/setup-java@v1
# with:
# # Specific java version to run
# java-version: 1.8
#
#
# # Run the assembleRelease gradle command to start the build process for our buildVariant
# - name: Assemble QA Bundle
# id: buildBundle
# uses: eskatos/[email protected]
# with:
# # Can be overridden with the desired gradle version
# gradle-version: 6.7.1
# wrapper-cache-enabled: true
# dependencies-cache-enabled: true
# configuration-cache-enabled: true
# # Specifies the gradle command to be run, can be replaced with any desired task
# arguments: bundleRelease
#
#
# # Sign the generated apk
# - name: Sign artifact
# id: signArtifact
# uses: r0adkll/sign-android-release@v1
# with:
# releaseDirectory: app/build/outputs/bundle/release
# signingKeyBase64: ${{ secrets.SIGNING_KEY }}
# alias: ${{ secrets.ALIAS }}
# keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
# keyPassword: ${{ secrets.KEY_PASSWORD }}
#
#
# # Create release with tag on Github
# - name: Create Release
# id: createRelease
# uses: actions/create-release@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# tag_name: ${{ github.ref }}
# release_name: Release ${{ github.ref }}
# draft: false
# prerelease: false
#
#
# # Deploy to alpha track
# - name: Deploy to beta test track
# uses: r0adkll/upload-google-play@v1
# with:
# serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_SERVICE_ACCOUNT }}
# packageName: com.hover.stax
# releaseFiles: app/build/outputs/bundle/release/*.aab
# track: production
## whatsNewDirectory: whatsnew/
#
#
# # Send slack notification
# - name: Send Slack notification
# uses: Ilshidur/[email protected]
# env:
# SLACK_WEBHOOK: ${{ secrets.STAX_SLACK_WEBHOOK }}
# SLACK_USERNAME: StaxDeploymentBot
# SLACK_CHANNEL: stax
# SLACK_AVATAR: sender
# with:
# args: 'Stax has just been deployed to Play Store production track. :truck:'

# Define jobs to be run sequentially or parallel
jobs:
# First job to be run called "build"
build:
# The type of runner the job will run on
runs-on: ubuntu-latest

# Sequence of tasks that will be executed as part of the job
steps:

# Checkout the repository so that the job can access it
- name: checkout
uses: actions/checkout@v2


# Set up our gradle properties for access by the Android build
- name: set up gradle properties
env:
HoverUsername: ${{ secrets.HOVER_USERNAME }}
HoverPassword: ${{ secrets.HOVER_PASSWORD }}
shell: bash
run: |
mkdir ~/.gradle
echo "GRADLE_USER_HOME=$HOME/.gradle" >> $GITHUB_ENV
echo "HoverUsername=$HoverUsername" >> ~/.gradle/gradle.properties
echo "HoverPassword=$HoverPassword" >> ~/.gradle/gradle.properties
# Set up JDK 1.8 for use
- name: set up JDK 1.8
uses: actions/setup-java@v1
with:
# Specific java version to run
java-version: 1.8


# Run the assembleRelease gradle command to start the build process for our buildVariant
- name: Assemble QA Bundle
id: buildBundle
uses: eskatos/[email protected]
with:
# Can be overridden with the desired gradle version
gradle-version: 6.7.1
wrapper-cache-enabled: true
dependencies-cache-enabled: true
configuration-cache-enabled: true
# Specifies the gradle command to be run, can be replaced with any desired task
arguments: bundleRelease


# Sign the generated apk
- name: Sign artifact
id: signArtifact
uses: r0adkll/sign-android-release@v1
with:
releaseDirectory: app/build/outputs/bundle/release
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
alias: ${{ secrets.ALIAS }}
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
keyPassword: ${{ secrets.KEY_PASSWORD }}


# Create release with tag on Github
- name: Create Release
id: createRelease
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.ref }}
release_name: Release ${{ github.ref }}
draft: false
prerelease: false



Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/qa-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: actions/setup-java@v1
with:
# Specific java version to run
java-version: 1.8
java-version: 11


# Run the assembleRelease gradle command to start the build process for our buildVariant
Expand All @@ -50,7 +50,7 @@ jobs:
uses: eskatos/[email protected]
with:
# Can be overridden with the desired gradle version
gradle-version: 6.7.1
gradle-version: 7.0.2
wrapper-cache-enabled: true
dependencies-cache-enabled: true
configuration-cache-enabled: true
Expand Down
6 changes: 3 additions & 3 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/runConfigurations.xml

This file was deleted.

29 changes: 16 additions & 13 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'com.google.firebase.crashlytics'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.google.firebase.firebase-perf'


Expand Down Expand Up @@ -42,8 +43,8 @@ android {
applicationId "com.hover.stax"
minSdkVersion 18
targetSdkVersion 30
versionCode 77
versionName "1.5.2.3"
versionCode 85
versionName "1.5.6.3"

vectorDrawables.useSupportLibrary = true
multiDexEnabled true
Expand All @@ -57,8 +58,8 @@ android {
}

compileOptions {
targetCompatibility 1.8
sourceCompatibility 1.8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

buildTypes {
Expand Down Expand Up @@ -103,36 +104,39 @@ dependencies {

// Google
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.5'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.5'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation "androidx.work:work-runtime:2.5.0"
implementation "androidx.work:work-runtime:2.6.0"
implementation "androidx.biometric:biometric:1.1.0"
implementation 'com.google.android.material:material:1.4.0'
implementation 'androidx.viewpager:viewpager:1.0.0'
implementation 'androidx.recyclerview:recyclerview-selection:1.1.0'
annotationProcessor "androidx.lifecycle:lifecycle-common-java8:2.3.1"
kapt "androidx.lifecycle:lifecycle-common-java8:2.3.1"
implementation "androidx.room:room-runtime:2.3.0"
annotationProcessor "androidx.room:room-compiler:2.3.0"
kapt "androidx.room:room-compiler:2.3.0"
androidTestImplementation "androidx.room:room-testing:2.3.0"

//logging
implementation 'com.jakewharton.timber:timber:4.7.1'

// Firebase
implementation platform('com.google.firebase:firebase-bom:26.0.0')
implementation platform('com.google.firebase:firebase-bom:28.4.0')
implementation 'com.google.firebase:firebase-crashlytics'
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-messaging'
implementation 'com.google.firebase:firebase-inappmessaging-display'
implementation 'com.google.firebase:firebase-config'
implementation 'com.google.android.play:core:1.10.0'

implementation 'com.google.firebase:firebase-perf'
implementation 'com.google.firebase:firebase-firestore-ktx'

//auth
implementation 'com.google.android.gms:play-services-auth:19.2.0'
implementation 'com.google.firebase:firebase-auth-ktx'

implementation 'com.amplitude:android-sdk:2.23.2'
implementation "com.squareup.okhttp3:okhttp:4.8.1"
implementation "com.googlecode.libphonenumber:libphonenumber:8.12.9"
Expand Down Expand Up @@ -162,12 +166,11 @@ dependencies {

// Hover SDK
debugImplementation project(":hover.sdk")

def sdk_version = "2.0.0-stax-1.5.0-pro"

releaseImplementation "com.hover:android-sdk:$sdk_version"
debugImplementation 'com.android.volley:volley:1.2.0'
debugImplementation 'com.google.android.gms:play-services-analytics:17.0.0'
debugImplementation 'com.android.volley:volley:1.2.1'
debugImplementation 'com.google.android.gms:play-services-analytics:17.0.1'

debugImplementation 'io.sentry:sentry-android:4.3.0'
}
Loading

0 comments on commit 6d61c44

Please sign in to comment.