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.

Sign up for GitHub

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

fix: fix version on build.gradle to compile in flutter version 3.24.3 #526

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −68
Open

fix: fix version on build.gradle to compile in flutter version 3.24.3 #526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 8 additions & 17 deletions android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ def compatibleVersion(prop, fallbackVersion, min = null, max = null) {
}

android {
compileSdkVersion compatibleVersion('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION).toInteger()
compileSdkVersion 33
namespace 'io.apparence.camerawesome'

defaultConfig {
minSdkVersion compatibleVersion('minSdkVersion', DEFAULT_MIN_SDK_VERSION, 21).toInteger()
minSdkVersion 21
}
lintOptions {
disable 'InvalidPackage'
Expand All @@ -124,33 +124,24 @@ android {
}

dependencies {

implementation 'io.reactivex.rxjava3:rxjava:3.0.4'
implementation 'io.reactivex.rxjava3:rxandroid:3.0.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4'
implementation 'androidx.test:rules:1.5.0'
// implementation project(path: ':integration_test')
def compatPlayServicesLocationVersion = compatibleVersion('playServicesLocationVersion', DEFAULT_PLAY_SERVICES_LOCATION_VERSION)
implementation "com.google.android.gms:play-services-location:$compatPlayServicesLocationVersion"
def compatExifInterfaceVersion = compatibleVersion('compatExifInterfaceVersion', DEFAULT_EXIF_INTERFACE_VERSION)
implementation "androidx.exifinterface:exifinterface:$compatExifInterfaceVersion"

implementation "com.google.android.gms:play-services-location:$DEFAULT_PLAY_SERVICES_LOCATION_VERSION"
implementation "androidx.exifinterface:exifinterface:$DEFAULT_EXIF_INTERFACE_VERSION"
testImplementation 'junit:junit:4.13.2'
// Optional -- Mockito framework
testImplementation "org.mockito:mockito-core:4.8.0"
// Optional -- mockito-kotlin
testImplementation "org.mockito.kotlin:mockito-kotlin:4.0.0"
implementation "androidx.media:media:$DEFAULT_MEDIA_VERSION"
implementation 'com.google.guava:guava:31.0.1-android'

def camerax_version = "1.3.0"
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}"
implementation "androidx.camera:camera-video:${camerax_version}"

implementation "androidx.camera:camera-view:${camerax_version}"
implementation "androidx.camera:camera-extensions:${camerax_version}"
def compatMediaVersion = compatibleVersion('compatMediaVersion', DEFAULT_MEDIA_VERSION)
implementation "androidx.media:media:${compatMediaVersion}"

implementation 'com.google.guava:guava:31.0.1-android'

}
30 changes: 15 additions & 15 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ packages:
path: ".."
relative: true
source: path
version: "2.0.1"
version: "2.1.0"
carousel_slider:
dependency: transitive
description:
Expand Down Expand Up @@ -306,18 +306,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
Expand Down Expand Up @@ -346,10 +346,10 @@ packages:
dependency: transitive
description:
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.11.1"
version: "0.8.0"
matrix2d:
dependency: transitive
description:
Expand All @@ -362,10 +362,10 @@ packages:
dependency: "direct main"
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.12.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -442,10 +442,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec"
url: "https://pub.dev"
source: hosted
version: "3.1.5"
version: "3.1.4"
plugin_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -543,10 +543,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.0"
typed_data:
dependency: transitive
description:
Expand Down Expand Up @@ -607,10 +607,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "14.2.4"
version: "14.2.1"
web:
dependency: transitive
description:
Expand Down
9 changes: 3 additions & 6 deletions lib/src/orchestrator/states/photo_camera_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ class PhotoCameraState extends CameraState {
required this.filePathBuilder,
required this.exifPreferences,
}) : super(cameraContext) {
_saveGpsLocationController =
BehaviorSubject.seeded(exifPreferences.saveGPSLocation);
_saveGpsLocationController = BehaviorSubject.seeded(exifPreferences.saveGPSLocation);
saveGpsLocation$ = _saveGpsLocationController.stream;
}

Expand Down Expand Up @@ -71,8 +70,7 @@ class PhotoCameraState extends CameraState {
OnPhotoCallback? onPhoto,
OnPhotoFailedCallback? onPhotoFailed,
}) async {
CaptureRequest captureRequest =
await filePathBuilder(sensorConfig.sensors.whereNotNull().toList());
CaptureRequest captureRequest = await filePathBuilder(sensorConfig.sensors.whereNotNull().toList());
final mediaCapture = MediaCapture.capturing(captureRequest: captureRequest);
if (!mediaCapture.isPicture) {
throw ("CaptureRequest must be a picture. ${captureRequest.when(
Expand Down Expand Up @@ -106,8 +104,7 @@ class PhotoCameraState extends CameraState {

bool get hasFilters => cameraContext.availableFilters?.isNotEmpty ?? false;

List<AwesomeFilter>? get availableFilters =>
cameraContext.availableFilters?.toList();
List<AwesomeFilter>? get availableFilters => cameraContext.availableFilters?.toList();

/// PRIVATES

Expand Down
45 changes: 16 additions & 29 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,18 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834
sha256: "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7"
url: "https://pub.dev"
source: hosted
version: "72.0.0"
_macros:
dependency: transitive
description: dart
source: sdk
version: "0.3.2"
version: "67.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139
sha256: "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d"
url: "https://pub.dev"
source: hosted
version: "6.7.0"
version: "6.4.1"
archive:
dependency: transitive
description:
Expand Down Expand Up @@ -220,18 +215,18 @@ packages:
dependency: transitive
description:
name: leak_tracker
sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.5"
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.5"
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
Expand All @@ -248,14 +243,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.0"
macros:
dependency: transitive
description:
name: macros
sha256: "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536"
url: "https://pub.dev"
source: hosted
version: "0.1.2-main.4"
matcher:
dependency: transitive
description:
Expand All @@ -268,10 +255,10 @@ packages:
dependency: transitive
description:
name: material_color_utilities
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.11.1"
version: "0.8.0"
matrix2d:
dependency: transitive
description:
Expand All @@ -284,10 +271,10 @@ packages:
dependency: transitive
description:
name: meta
sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.12.0"
package_config:
dependency: transitive
description:
Expand Down Expand Up @@ -449,10 +436,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.7.2"
version: "0.7.0"
typed_data:
dependency: transitive
description:
Expand All @@ -473,10 +460,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: f652077d0bdf60abe4c1f6377448e8655008eef28f128bc023f7b5e8dfeb48fc
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "14.2.4"
version: "14.2.1"
watcher:
dependency: transitive
description:
Expand Down
3 changes: 2 additions & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ homepage: https://Apparence.io
repository: https://github.com/Apparence-io/camera_awesome

environment:
sdk: '>=3.2.6 <4.0.0'
sdk: ">=3.2.6 <4.0.0"
flutter: ">=1.10.0"

dependencies:
Expand All @@ -21,6 +21,7 @@ dependencies:
image: ^4.1.3
path_provider: ^2.1.1
rxdart: ^0.28.0

dev_dependencies:
flutter_lints: ^4.0.0
flutter_test:
Expand Down