Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/myredsocks/catcher
Browse files Browse the repository at this point in the history
* 'master' of https://github.com/myredsocks/catcher:
  fix: fixed issues reported by pub (jhomlala#263)
  Feat/0.8.0 (jhomlala#261)
  Updated version in readme
  Update packages
  Update packages
  Update GitHub Actions
  Update packages
  Update packages
  Update packages
  Revert "Add Android Id Plugin"
  Update changelog
  Add Android Id Plugin
  Add gradle wrapper
  Update constraints and device_info_plus
  Update to Flutter 3

# Conflicts:
#	pubspec.yaml
  • Loading branch information
aovooyov committed Mar 29, 2024
2 parents 68a888e + 7aaebbc commit 8e83534
Show file tree
Hide file tree
Showing 71 changed files with 2,293 additions and 1,340 deletions.
24 changes: 14 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,30 @@ on:

jobs:
check-format:
name: Check format using flutter format
runs-on: ubuntu-latest
container: cirrusci/flutter:stable
name: Check format using dart format.
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Check format
run: flutter format -n --set-exit-if-changed .
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Flutter Action
uses: subosito/flutter-action@v2
- name: Check format
run: dart format . --set-exit-if-changed

lint:
name: Lint
runs-on: ubuntu-latest
container: cirrusci/flutter:stable

steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Flutter Action
uses: subosito/flutter-action@v2
- name: Install Package Dependencies
run: flutter packages get
- name: Get dependencies for example
run: flutter pub get
working-directory: example
- name: Lint using flutter analyze
run: flutter analyze
run: flutter analyze .
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,10 @@ ios/Runner/GeneratedPluginRegistrant.*
example/macos/Flutter/
example/linux/flutter/

*.txt
android/.gradle

.flutter-plugins
.flutter-plugins-dependencies
flutter_export_environment.sh
*.lock
.vscode
android/gradlew
android/gradlew.bat
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
## 0.8.0
* [BREAKING_CHANGE] Updated min android version to 22 and target/compile version to 34.
* Updated dependencies version.
* Replaced lint with very_good_analysis package.
* Fixed screenshot manger not creating screenshots.
* Update pub.dev metadata.

## 0.7.0
* [BREAKING_CHANGE] Update to Flutter 3 by Nico Mexis (https://github.com/ThexXTURBOXx).
* [BREAKING_CHANGE] Update device_info_plus and added android_id plugin by Nico Mexis (https://github.com/ThexXTURBOXx).

## 0.6.9
* [BREAKING_CHANGE] Changed customMessageBuilder return type to FutureOr<String> in slack and discord handler.
* Fixed screenshots example documents path.
* Fixed logger issue.
* Fixed lint.
* Depdencies and Android 12 update by Nico Mexis (https://github.com/ThexXTURBOXx).
* Dependencies and Android 12 update by Nico Mexis (https://github.com/ThexXTURBOXx).
* Removed deprecated splash screen from Android example.

## 0.6.8
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Catcher supports Android, iOS, Web, Linux, Windows and MacOS platforms.
Add this line to your **pubspec.yaml**:
```yaml
dependencies:
catcher: ^0.6.9
catcher: ^0.8.0
```
Then run this command:
Expand Down
26 changes: 10 additions & 16 deletions analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,16 @@
#include: package:lint/analysis_options_package.yaml

analyzer:
strong-mode:
implicit-dynamic: false
include: package:very_good_analysis/analysis_options.yaml

linter:
rules:
close_sinks: true
public_member_api_docs: false
flutter_style_todos: false
avoid_final_parameters: false
sort_constructors_first: false
avoid_classes_with_only_static_members: false
avoid_void_async: false
avoid_positional_boolean_parameters: false
avoid_function_literals_in_foreach_calls: false
prefer_constructors_over_static_methods: false
sort_unnamed_constructors_first: false
sized_box_for_whitespace: false
invalid_dependency: false
sort_pub_dependencies: false
import_of_legacy_library_into_null_safe: false
avoid_positional_boolean_parameters: false
use_if_null_to_convert_nulls_to_bools: false
use_build_context_synchronously: false
use_setters_to_change_properties: false
prefer_constructors_over_static_methods: false
use_setters_to_change_properties: false
avoid_print: false
sort_pub_dependencies: false
8 changes: 4 additions & 4 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ group 'com.jhomlala.catcher'
version '1.0-SNAPSHOT'

buildscript {
ext.kotlin_version = '1.5.31'
ext.kotlin_version = '1.7.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.2.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -25,13 +25,13 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
compileSdkVersion 31
compileSdkVersion 34

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 16
minSdkVersion 22
}
}

Expand Down
Binary file added android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
Loading

0 comments on commit 8e83534

Please sign in to comment.