Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Android SDKs, Java JDK and action versions to newer versions #522

Merged
merged 9 commits into from
Oct 15, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:

env:
FLUTTER_VERSION: 3.13.1
JAVA_VERSION: 11.x
JAVA_VERSION: 17.x
PROD_RELEASE: ${{ inputs.prodRelease || 'false' }}
TAG_NAME: ${{ inputs.tagName || 'dev' }}

Expand Down Expand Up @@ -56,7 +56,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4.1.0

- name: Install Apple certificate and provisioning profile (dev)
if: env.PROD_RELEASE != 'true'
Expand All @@ -77,13 +77,13 @@ jobs:
APPLE_KEYCHAIN_PW: ${{ secrets.APPLE_KEYCHAIN_PW }}

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3.13.0
with:
distribution: "adopt"
java-version: ${{ env.JAVA_VERSION }}

- name: Setup Flutter environment
uses: subosito/flutter-action@v2
uses: subosito/flutter-action@v2.11.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
Expand All @@ -104,7 +104,7 @@ jobs:

- name: Upload iOS build
if: ${{ inputs.storeArtifacts }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
with:
name: ios
path: build-output/ios
Expand All @@ -117,16 +117,16 @@ jobs:
needs: [version]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4.1.0

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v3.13.0
with:
distribution: "adopt"
java-version: ${{ env.JAVA_VERSION }}

- name: Setup Flutter environment
uses: subosito/flutter-action@v2
uses: subosito/flutter-action@v2.11.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
Expand All @@ -151,7 +151,7 @@ jobs:

- name: Upload Android build
if: ${{ inputs.storeArtifacts }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v3.1.3
with:
name: android
path: build/app/outputs/flutter-apk
Expand All @@ -164,10 +164,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2.4.0
uses: actions/checkout@v4.1.0

- name: Setup Flutter environment
uses: subosito/flutter-action@v1.5.3
fremartini marked this conversation as resolved.
Show resolved Hide resolved
uses: subosito/flutter-action@v2.11.0
with:
flutter-version: ${{ env.FLUTTER_VERSION }}
channel: "stable"
Expand All @@ -191,7 +191,7 @@ jobs:
run: flutter test --coverage

- name: Upload test report to Codecov
uses: codecov/codecov-action@v2.1.0
uses: codecov/codecov-action@v3.1.4
with:
flags: unittests
file: coverage/lcov.info
8 changes: 4 additions & 4 deletions .github/workflows/release-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ jobs:

steps:
- name: Download Artifact
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
name: ios

- name: Firebase App Distribution
uses: wzieba/Firebase-Distribution-Github-Action@v1.3.3
uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
with:
appId: ${{ secrets.FIREBASE_IOS_APP_ID }}
token: ${{ secrets.FIREBASE_TOKEN }}
Expand All @@ -40,12 +40,12 @@ jobs:

steps:
- name: Download artifact
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
name: android

- name: Firebase App Distribution
uses: wzieba/Firebase-Distribution-Github-Action@v1.3.3
uses: wzieba/Firebase-Distribution-Github-Action@v1.7.0
with:
appId: ${{ secrets.FIREBASE_ANDROID_APP_ID }}
token: ${{ secrets.FIREBASE_TOKEN }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Download artifact
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
name: ios

Expand All @@ -38,12 +38,12 @@ jobs:

steps:
- name: Download artifact
uses: actions/[email protected].0
uses: actions/[email protected].2
with:
name: android

- name: Sign Android appbundle
uses: r0adkll/sign-android-release@v1
uses: r0adkll/sign-android-release@v1.0.4
id: sign_app
with:
releaseDirectory: .
Expand All @@ -53,7 +53,7 @@ jobs:
keyPassword: ${{ secrets.ANDROID_KEY_PASSWORD }}

- name: Upload to Google Play Store
uses: r0adkll/upload-google-play@v1
uses: r0adkll/upload-google-play@v1.1.2
with:
serviceAccountJsonPlainText: ${{ secrets.PLAYSTORE_SERVICE_ACCOUNT_JSON }}
packageName: dk.analog.digitalclipcard
Expand Down
12 changes: 6 additions & 6 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ apply plugin: 'com.google.firebase.crashlytics'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
compileSdkVersion 33
compileSdk 34

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

kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}

sourceSets {
Expand All @@ -46,8 +46,8 @@ android {


defaultConfig {
minSdkVersion 21
targetSdkVersion 33
minSdkVersion 23
targetSdkVersion 34
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
}
Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="dk.analog.digitalclipcard">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
Expand Down
6 changes: 3 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
buildscript {
ext.kotlin_version = '1.8.21'
ext.kotlin_version = '1.9.10'
repositories {
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.2.0'
classpath 'com.android.tools.build:gradle:8.1.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.10'
classpath 'com.google.gms:google-services:4.3.14'
classpath 'com.google.firebase:perf-plugin:1.4.1'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1'
}
Expand Down
3 changes: 3 additions & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ org.gradle.jvmargs=-Xmx1536M
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed May 18 08:56:18 CEST 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME