Skip to content

Commit

Permalink
Merge pull request #77 from ngageoint/newPinDrop
Browse files Browse the repository at this point in the history
Merge changes from new pin drop workflow and updates
  • Loading branch information
jclark118 authored Jan 4, 2024
2 parents eccc9df + e738836 commit 6055e23
Show file tree
Hide file tree
Showing 5 changed files with 10,576 additions and 7 deletions.
14 changes: 12 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ jobs:
steps:
- name: Checkout Repository
uses: actions/checkout@v3
- name: set up JDK 16
- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 16
java-version: 17
distribution: 'adopt'
- name: Setup Keystore
run: |
Expand All @@ -35,6 +35,16 @@ jobs:
-PKEY_ALIAS=${{ secrets.ALIAS }} \
-PKEY_PASSWORD=${{ secrets.KEY_PASSWORD }} \
-PRELEASE_MAPS_MAPCACHE_API_KEY=${{ secrets.RELEASE_MAPS_MAPCACHE_API_KEY }}
- run: ./gradlew lint
- uses: yutailang0119/action-android-lint@v3.1.0
with:
report-path: build/reports/*.xml
follow-symbolic-links: true
- name: print lint xml results
uses: hidakatsuya/action-report-android-lint@v1.1.4
with:
result-path: 'mapcache/build/reports/lint-results-debug.xml'
fail-on-warning: false
- name: Verify Signature
run: $ANDROID_SDK_ROOT/build-tools/33.0.1/apksigner verify --print-certs mapcache/build/outputs/apk/release/mapcache.apk
- name: List files in the repository
Expand Down
7 changes: 6 additions & 1 deletion mapcache/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ android {
}
}
}
lint {
baseline file("lint-baseline.xml")
checkReleaseBuilds false
abortOnError false
}
}

task androidAppVersion {
Expand All @@ -84,7 +89,7 @@ task androidAppVersion {
dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
api 'androidx.appcompat:appcompat:1.6.1'
api 'androidx.activity:activity:1.8.0'
api 'androidx.activity:activity:1.8.1'
api 'com.google.android.material:material:1.6.0'
api 'androidx.preference:preference:1.2.1'
api 'androidx.lifecycle:lifecycle-extensions:2.2.0'
Expand Down
Loading

0 comments on commit 6055e23

Please sign in to comment.