Skip to content

Commit

Permalink
Update Dependencies, Gradle and Workflows, Add Dependabot (#1988)
Browse files Browse the repository at this point in the history
* Update

* Update
  • Loading branch information
CanerKaraca23 committed Apr 18, 2024
1 parent c59a606 commit e85b32e
Show file tree
Hide file tree
Showing 22 changed files with 392 additions and 316 deletions.
10 changes: 10 additions & 0 deletions .github/dependabot.yml
@@ -0,0 +1,10 @@
version: 2
updates:
- package-ecosystem: github-actions
directory: /
schedule:
interval: daily
- package-ecosystem: gradle
directory: /
schedule:
interval: daily
64 changes: 0 additions & 64 deletions .github/workflows/Android-CI-Espresso.yml

This file was deleted.

23 changes: 23 additions & 0 deletions .github/workflows/CI.yml
@@ -0,0 +1,23 @@
name: CI

on:
push:
branches:
- master
pull_request:
workflow_dispatch:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
cache: gradle
- uses: malinskiy/action-android/install-sdk@release/0.1.6
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
- run: ./gradlew build
29 changes: 29 additions & 0 deletions .github/workflows/Espresso.yml
@@ -0,0 +1,29 @@
name: Espresso

on:
workflow_dispatch:

jobs:
Espresso:
runs-on: ubuntu-latest
continue-on-error: true
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 17
distribution: temurin
- uses: malinskiy/action-android/install-sdk@release/0.1.6
env:
ACTIONS_ALLOW_UNSECURE_COMMANDS: true
- uses: malinskiy/action-android/emulator-run-cmd@release/0.1.6
with:
cmd: ./gradlew clean build connectedCheck
api: 29
tag: default
abi: x86
- uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: Espresso-report
path: ./**/build/reports/androidTests/connected
17 changes: 0 additions & 17 deletions .github/workflows/gradle-wrapper-validation.yml

This file was deleted.

14 changes: 14 additions & 0 deletions .github/workflows/update-gradle-wrapper.yml
@@ -0,0 +1,14 @@
name: Update Gradle Wrapper

on:
workflow_dispatch:

jobs:
update-gradle-wrapper:
runs-on: ubuntu-latest
steps:
- name: Checkout the code
uses: actions/checkout@v4

- name: Update Gradle Wrapper
uses: gradle-update/update-gradle-wrapper-action@main
10 changes: 5 additions & 5 deletions OSMMapTilePackager/build.gradle
Expand Up @@ -27,12 +27,12 @@ tasks.withType(Javadoc) {
}

dependencies {
implementation 'org.apache.httpcomponents:httpmime:4.5.13'
implementation 'org.apache.james:apache-mime4j:0.8.7'
implementation 'org.xerial:sqlite-jdbc:3.36.0.3'
implementation 'org.apache.httpcomponents:httpmime:4.5.14'
implementation 'org.apache.james:apache-mime4j:0.8.11'
implementation 'org.xerial:sqlite-jdbc:3.45.2.0'


testImplementation "junit:junit:${project.property('junit.version')}"
testImplementation "org.junit.vintage:junit-vintage-engine:${project.property('junit.version')}"
}

//copy the instrumentation tests from the maven osmdroid-android-it src folder
Expand Down Expand Up @@ -115,4 +115,4 @@ afterEvaluate {
}


}
}
34 changes: 17 additions & 17 deletions OpenStreetMapViewer/build.gradle
Expand Up @@ -21,11 +21,11 @@ android {
multiDexEnabled = true

compileSdkVersion(project.hasProperty('android.compileSdkVersion')
? Integer.parseInt(project.property('android.compileSdkVersion')) : 23)
? Integer.parseInt(project.property('android.compileSdkVersion')) : 34)

// default targetSdkVersion to API 23, if not provided
targetSdkVersion(project.hasProperty('android.targetSdkVersion')
? Integer.parseInt(project.property('android.targetSdkVersion')) : 23)
? Integer.parseInt(project.property('android.targetSdkVersion')) : 30)

// default versionCode o 1 if not provided
versionCode(project.hasProperty('android.versionCode')
Expand Down Expand Up @@ -64,9 +64,9 @@ dependencies {
//are not longer resolved...

//osmdroid-mapsforge
implementation 'org.mapsforge:mapsforge-map-android:0.20.0'
implementation 'org.mapsforge:mapsforge-map:0.20.0'
implementation 'org.mapsforge:mapsforge-themes:0.20.0'
implementation 'org.mapsforge:mapsforge-map-android:0.21.0'
implementation 'org.mapsforge:mapsforge-map:0.21.0'
implementation 'org.mapsforge:mapsforge-themes:0.21.0'


implementation "androidx.legacy:legacy-support-v4:1.0.0"
Expand All @@ -76,40 +76,40 @@ dependencies {
implementation project(':osmdroid-wms')
implementation project(':osmdroid-shape')

implementation 'io.github.missioncommand:mil-sym-android-renderer:0.1.48'
implementation 'io.github.missioncommand:mil-sym-android-renderer:0.1.59'

//used for various demos for picking offline tile archives
implementation 'com.github.angads25:filepicker:1.1.1'

//used for bookmark demo
implementation group: 'com.opencsv', name: 'opencsv', version: '4.4'
implementation group: 'com.opencsv', name: 'opencsv', version: '5.8'

//usual android stuff
implementation "com.google.android.material:material:1.6.1" //needed for UI menuing
implementation "com.google.android.material:material:1.11.0" //needed for UI menuing
implementation "androidx.cardview:cardview:1.0.0"
implementation "androidx.recyclerview:recyclerview:1.2.1"
implementation "androidx.recyclerview:recyclerview:1.3.2"
implementation 'androidx.multidex:multidex:2.0.1'

implementation "androidx.appcompat:appcompat:1.4.2"
implementation "androidx.appcompat:appcompat:1.6.1"
//crash logging
implementation 'ch.acra:acra:4.7.0'

//memory leak testing
implementation 'com.squareup.leakcanary:leakcanary-android:2.2'
implementation 'com.squareup.leakcanary:leakcanary-android:2.13'

//on device testing
androidTestImplementation 'androidx.multidex:multidex:2.0.0'
androidTestImplementation 'androidx.multidex:multidex:2.0.1'
androidTestImplementation "androidx.annotation:annotation:1.3.0"


androidTestImplementation "androidx.test:runner:1.4.0"
androidTestImplementation "androidx.test:rules:1.4.0"
androidTestImplementation "androidx.test:runner:1.5.2"
androidTestImplementation "androidx.test:rules:1.5.0"
// Optional -- UI testing with Espresso
androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
// Optional -- UI testing with UI Automator
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.2.0"
androidTestImplementation "androidx.test.uiautomator:uiautomator:2.3.0"
// Optional -- UI testing with Compose
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.1.0"
androidTestImplementation "androidx.compose.ui:ui-test-junit4:1.6.5"
}


Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Expand Up @@ -18,7 +18,7 @@ buildscript {

// Set up the spotbugs plugin so we can apply it in a quality pass if needed
plugins {
id 'com.github.spotbugs' version '5.0.6' apply false
id 'com.github.spotbugs' version '6.0.9' apply false
}

allprojects {
Expand Down
19 changes: 9 additions & 10 deletions gradle.properties
Expand Up @@ -9,7 +9,7 @@ org.gradle.configureondemand true
# "Specifies the jvmargs used for the daemon process. The setting is particularly useful for
# tweaking memory settings. At the moment, the default settings are pretty generous with regards
# to memory."
org.gradle.jvmargs=-Xms256m -Xmx2048m -XX:MaxPermSize=256m
org.gradle.jvmargs=-Xms8G -Xmx8G


# Dependency version configurations ----------------------------------------------------------------
Expand Down Expand Up @@ -37,14 +37,14 @@ org.gradle.jvmargs=-Xms256m -Xmx2048m -XX:MaxPermSize=256m
#
# --------------------------------------------------------------------------------------------------

gradleFury.version=1.0.14
gradleFury.version=1.1.3


android-plugin.version=7.1.3
android-plugin.version=7.2.2
# To be used for packages that depend on support lib (minSDK = 14 since 26.0.0)
android-minSdkForSupportLib.version=14
junit.version=4.13.2
robolectric.version=4.7.3
junit.version=5.10.2
robolectric.version=4.11.1
android.useAndroidX=true
android.enableJetifier=true
# Maven Repository (i.e. Sonatype Nexus Repository Manager) Configuration --------------------------
Expand All @@ -59,14 +59,14 @@ SNAPSHOT_REPOSITORY_URL=https://oss.sonatype.org/content/repositories/snapshots/

# Java Configuration -------------------------------------------------------------------------------

compileJava.sourceCompatibility=1.7
compileJava.targetCompatibility=1.7
compileJava.sourceCompatibility=17
compileJava.targetCompatibility=17


# Android Configuration (used by gradle/android-support.gradle) ------------------------------------

android.buildToolsVersion=26.0.3
android.compileSdkVersion=31
android.buildToolsVersion=34.0.0
android.compileSdkVersion=34
android.minSdkVersion=8
android.targetSdkVersion=30

Expand Down Expand Up @@ -147,4 +147,3 @@ pom.developers.developer.3.name=Matt Kergall
pom.developers.developer.3.role.0=developer

# TODO update with the rest of the crew

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Fri Mar 19 08:47:02 GMT 2021
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-bin.zip

0 comments on commit e85b32e

Please sign in to comment.