Skip to content

Commit

Permalink
Update Android Deployment (#184)
Browse files Browse the repository at this point in the history
  • Loading branch information
jakobkoerber authored Dec 22, 2023
1 parent a537ea2 commit a2f356e
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 35 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/deploy_beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ jobs:
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.ASC_ISSUER_ID }}
APP_STORE_CONNECT_API_KEY_BASE64: ${{ secrets.ASC_PRIVATE_KEY }}
MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
KEYCHAIN_NAME: ${{ secrets.KEYCHAIN_NAME }}
KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
RELEASE_NOTES: ${{ github.event.release.body }}

- if: matrix.platform == 'android'
Expand All @@ -79,5 +77,4 @@ jobs:
ANDROID_KEYSTORE_FILE: ./upload-keystore
ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }}
ANDROID_KEY_ALIAS: ${{ secrets.ANDROID_KEY_ALIAS }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
# RELEASE_NOTES: ${{ github.event.release.body }}
ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD }}
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ android {
}

defaultConfig {
applicationId "de.tum.tca_flutter"
applicationId "de.tum.in.tumcampus"
minSdkVersion 26
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
Expand Down
2 changes: 1 addition & 1 deletion android/fastlane/Appfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
package_name("de.tum.tca_flutter")
package_name("de.tum.in.tumcampus")
8 changes: 3 additions & 5 deletions android/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,21 @@ platform :android do
upload_to_play_store(
json_key_data: Base64.strict_decode64(ENV["GOOGLE_PLAY_SERVICE_ACCOUNT_KEY"]),
aab: "../build/app/outputs/bundle/release/app-release.aab",
track: "beta",
track: "internal",
release_status: "draft",
)
end

def latest_google_play_version_code
json_key_data = Base64.strict_decode64(ENV["GOOGLE_PLAY_SERVICE_ACCOUNT_KEY"])
# productionVersionCodes = google_play_track_version_codes(track: 'production', json_key_data: json_key_data)
productionVersionCodes = google_play_track_version_codes(track: 'production', json_key_data: json_key_data)
betaVersionCodes = google_play_track_version_codes(track: 'beta', json_key_data: json_key_data)
# alphaVersionCodes = google_play_track_version_codes(track: 'alpha', json_key_data: json_key_data)
internalVersionCodes = google_play_track_version_codes(track: 'internal', json_key_data: json_key_data)

# puts version codes from all tracks into the same array
versionCodes = [
# productionVersionCodes,
productionVersionCodes,
betaVersionCodes,
# alphaVersionCodes,
internalVersionCodes
].reduce([], :concat)

Expand Down
6 changes: 1 addition & 5 deletions ios/fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ platform :ios do
skip_certificate_matching: true
)

increment_version_number(
version_number: File.read("../iosVersion.txt")
)

previous_build_number = latest_testflight_build_number(initial_build_number: 0, version: File.read("../iosVersion.txt"))
previous_build_number = latest_testflight_build_number(initial_build_number: 0)

current_build_number = previous_build_number + 1

Expand Down
1 change: 0 additions & 1 deletion ios/iosVersion.txt

This file was deleted.

2 changes: 1 addition & 1 deletion lib/firebase_options.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class DefaultFirebaseOptions {

static const FirebaseOptions android = FirebaseOptions(
apiKey: 'AIzaSyD917lW3Y2-x8UiWfUdzKDnI1iO7Qt7Z5s',
appId: '1:944892355389:android:510d92307b08a9c352db54',
appId: '1:944892355389:android:3fec122c5eb51ef4',
messagingSenderId: '944892355389',
projectId: 'tca-backend-0001',
databaseURL: 'https://tca-backend-0001.firebaseio.com',
Expand Down
4 changes: 2 additions & 2 deletions lib/gradeComponent/views/chart_view.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ class ChartView extends ConsumerWidget {
),
),
SfCartesianChart(
primaryXAxis: CategoryAxis(),
primaryXAxis: const CategoryAxis(),
primaryYAxis: NumericAxis(
minimum: 0,
maximum: data.values.reduce(max).toDouble(),
interval: 1,
),
series: <ChartSeries<MapEntry<dynamic, int>, String>>[
series: <CartesianSeries<MapEntry<dynamic, int>, String>>[
ColumnSeries<MapEntry<dynamic, int>, String>(
dataSource: data.entries.toList(),
xValueMapper: (MapEntry<dynamic, int> data, _) =>
Expand Down
22 changes: 11 additions & 11 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ packages:
description:
path: "packages/google_maps_flutter/google_maps_flutter_ios"
ref: main
resolved-ref: a6a8d802faf7cdce00860af42d5de579b93062df
resolved-ref: a3e8a5cbec64cb384ced9941ea39e0a11d49cd68
url: "https://github.com/jakobkoerber/packages.git"
source: git
version: "2.3.3"
Expand Down Expand Up @@ -1232,42 +1232,42 @@ packages:
dependency: "direct main"
description:
name: syncfusion_flutter_calendar
sha256: d57808a698c6ab1f0b79445822e84fdbcbb99ed7a6e33a4171a5265ad32f4b25
sha256: ef1df99b0baf57c4b339d905a447633a8cbc612ac0e691ca0886591c9845fbb6
url: "https://pub.dev"
source: hosted
version: "23.2.7"
version: "24.1.41"
syncfusion_flutter_charts:
dependency: "direct main"
description:
name: syncfusion_flutter_charts
sha256: "97142a0192f6fd44f299c30c0b97399ab503de17ef3860e560078bb6be3903de"
sha256: "6f2ea3eaa34b998ba68461f6c8457f01cf8c07cf376a57069f9995a9cae1eb33"
url: "https://pub.dev"
source: hosted
version: "23.2.7"
version: "24.1.41"
syncfusion_flutter_core:
dependency: transitive
description:
name: syncfusion_flutter_core
sha256: a2427697bfad5b611db78ea4c4daef82d3350b83c729a8dc37959662a31547f9
sha256: "69c827931957d5b121ee9f0b9b0b8d7d0d1ac537b61bcdd5c3fbffc044bbe86e"
url: "https://pub.dev"
source: hosted
version: "23.2.7"
version: "24.1.41"
syncfusion_flutter_datepicker:
dependency: "direct main"
description:
name: syncfusion_flutter_datepicker
sha256: b3340a7786f674d18bd22c226358648985e7631734dfc4aae09fdcfb71c09156
sha256: "13c48582dc911663eac286791f009474fae964a731dc719d86ba0de8d8ade6f0"
url: "https://pub.dev"
source: hosted
version: "23.2.7"
version: "24.1.41"
synchronized:
dependency: transitive
description:
name: synchronized
sha256: "5fcbd27688af6082f5abd611af56ee575342c30e87541d0245f7ff99faa02c60"
sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "3.1.0+1"
term_glyph:
dependency: transitive
description:
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: campus_flutter
description: A new Flutter project.
publish_to: 'none'
version: 0.4.0
version: 4.4.0

environment:
sdk: '>=3.0.0 <4.0.0'
Expand All @@ -27,8 +27,8 @@ dependencies:
path_provider: ^2.0.15
rxdart: ^0.27.7
shimmer: ^3.0.0
syncfusion_flutter_calendar: ^23.1.36
syncfusion_flutter_charts: ^23.1.36
syncfusion_flutter_calendar: ^24.1.41
syncfusion_flutter_charts: ^24.1.41
url_launcher: ^6.1.10
video_player: ^2.6.1
xml: ^6.2.2
Expand All @@ -42,7 +42,7 @@ dependencies:
grpc: ^3.2.4
protobuf: ^3.0.0
tflite_flutter: ^0.10.1
syncfusion_flutter_datepicker: ^23.1.36
syncfusion_flutter_datepicker: ^24.1.41
google_maps_flutter: ^2.4.0
map_launcher: ^3.0.1
flutter_staggered_grid_view: ^0.7.0
Expand Down

0 comments on commit a2f356e

Please sign in to comment.