Skip to content

Commit

Permalink
Feature/nevisaccessapp 6211 gradle updates (#23)
Browse files Browse the repository at this point in the history
- Update Gradle to v8.7 (including scripts) and AGP to v8.6.1
- Set target SDK version to 34 (Android 14) and update dependencies
- Set Java source compatibility to 17 as required by Gradle
- Update Kotlin to v1.9.23
- Update GitHub Actions to also use Java 17
- Update Development Setup in README
  • Loading branch information
balazs-gerlei authored Oct 2, 2024
1 parent bad54b8 commit 669d953
Show file tree
Hide file tree
Showing 10 changed files with 291 additions and 222 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
workflow_dispatch:

env:
JAVA_VERSION: '11'
JAVA_VERSION: '17'
RUBY_VERSION: '3.0'
CURRENT_BUILD_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
types: [opened, edited, synchronize, reopened]

env:
JAVA_VERSION: '11'
JAVA_VERSION: '17'
RUBY_VERSION: '3.0'

jobs:
Expand Down
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ Before you start compiling and using the example applications please ensure you
- Android 6 or later, with API level 23
- Android 10 or later, with API level 29, for the biometric authenticator to work
- Android 11 or later, with API level 30, for the device passcode authenticator to work
- Android Studio 3.5.1 or later
- JDK 11
- Gradle 7.2 or later
- JDK 17
- Gradle 8.7 or later

### Github Account

Expand Down
24 changes: 12 additions & 12 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ static def readVersionName(project) {

android {
namespace 'ch.nevis.exampleapp'
compileSdk 33
compileSdk 34

defaultConfig {
applicationId "ch.nevis.exampleapp"
minSdk 23
targetSdk 33
targetSdk 34
versionCode readVersionCode(this)
versionName readVersionName(this)

Expand All @@ -59,29 +59,29 @@ android {
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}

kotlinOptions {
jvmTarget = 11
jvmTarget = 17
}
}

dependencies {
implementation 'androidx.core:core-ktx:1.10.1'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.9.0'
implementation 'androidx.core:core-ktx:1.13.1'
implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'

// Barcode Scanning, to scan QR codes
implementation 'com.google.mlkit:barcode-scanning:17.2.0'
implementation 'com.google.mlkit:barcode-scanning:17.3.0'

// CameraX
def camerax_version = "1.2.3"
def camerax_version = "1.3.4"
implementation "androidx.camera:camera-core:${camerax_version}"
implementation "androidx.camera:camera-camera2:${camerax_version}"
implementation "androidx.camera:camera-lifecycle:${camerax_version}"
Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.dagger_hilt_version = "2.44.2"
ext.gradle_version = "7.3.1"
ext.kotlin_version = "1.8.10"
ext.navigation_version = "2.5.3"
ext.dagger_hilt_version = "2.51.1"
ext.gradle_version = '8.6.1'
ext.kotlin_version = "1.9.23"
ext.navigation_version = "2.8.1"
ext.dokka_version = "1.9.20"
ext.customFooterMessage = "© 2024 made with ❤️ by Nevis"
ext.customLogoFile = projectDir.toString() + "/logo-style.css"
Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,5 @@ android.nonTransitiveRClass=true
VERSION_NAME=3.7.0
VERSION_CODE=1
NEVIS_MOBILE_AUTHENTICATION_SDK_VERSION=3.7.+
android.defaults.buildfeatures.buildconfig=true
android.nonFinalResIds=false
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
7 changes: 4 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Tue Jan 03 10:09:41 CET 2023
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 669d953

Please sign in to comment.