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

issue #29 Fix Pixel Overflow Error in Upcoming Match Card #41

Merged
merged 6 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
9 changes: 5 additions & 4 deletions .github/workflows/flutter_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- main
- 2023
- 2023
pull_request:
branches:
- main
Expand All @@ -19,10 +19,11 @@ jobs:
- name: Check out code
uses: actions/checkout@v2


- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: 3.7.10
flutter-version: 3.24.3

- name: Install dependencies
run: flutter pub get
Expand All @@ -37,13 +38,13 @@ jobs:
run: flutter build ios

- name: Archive and upload Android artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: build-android
path: build/app/outputs/flutter-apk/app-release.apk

- name: Archive and upload iOS artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: build-ios
path: build/ios/Runner.app
18 changes: 15 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,19 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
}

android {
compileSdkVersion 33
namespace "com.arcadia.auction"
compileSdkVersion flutter.compileSdkVersion


compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = '1.8'
}


sourceSets {
main.java.srcDirs += 'src/main/kotlin'
Expand All @@ -42,8 +54,8 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.arcadia.auction"
minSdkVersion 21
targetSdkVersion 33
minSdkVersion 23
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
Expand Down
10 changes: 7 additions & 3 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
buildscript {
ext.kotlin_version = '1.9.10'
ext.kotlin_version = '2.0.21'
repositories {
google()
jcenter()
mavenCentral()
}

dependencies {
classpath 'com.google.gms:google-services:4.3.14'
classpath 'com.android.tools.build:gradle:7.3.0'
classpath 'com.google.gms:google-services:4.4.2'
classpath 'com.android.tools.build:gradle:8.7.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -16,12 +17,15 @@ allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

rootProject.buildDir = '../build'
subprojects {
project.buildDir = "${rootProject.buildDir}/${project.name}"
}
subprojects {
project.evaluationDependsOn(':app')
}

Expand Down
Loading
Loading