Skip to content

Commit

Permalink
Feature/3.2.1 (#51)
Browse files Browse the repository at this point in the history
* u

* Create flutter_analyze.yaml

* Update flutter_analyze.yaml
  • Loading branch information
hukusuke1007 authored Aug 24, 2024
1 parent 7a323d5 commit 258da0b
Show file tree
Hide file tree
Showing 9 changed files with 316 additions and 272 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/flutter_analyze.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: flutter_analyze

on:
push:
branches:
- main

pull_request:
branches:
- main

jobs:
lint:
strategy:
matrix:
os: [macos-12]
flutter-version: ['3.24.1']
flutter-channel: [stable]

name: flutter_analyze
runs-on: ${{ matrix.os }}
steps:
- name: set up repository
uses: actions/checkout@v3
- name: set up flutter
uses: subosito/flutter-action@v2
with:
flutter-version: ${{ matrix.flutter-version }}
channel: ${{ matrix.flutter-channel }}
cache: false
- name: flutter doctor
run: flutter doctor -v
- name: flutter pub get
run: flutter pub get
- name: flutter analyze
run: flutter analyze
- name: flutter test
run: flutter test
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
# 3.2.0
# 3.2.1
Bug fix [#50](https://github.com/hukusuke1007/stop_watch_timer/pull/50).
Updated example code.

## 3.2.0
Updated RxDart.
Added test code and refactored code [#49](https://github.com/hukusuke1007/stop_watch_timer/pull/49).

Expand Down
46 changes: 14 additions & 32 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,49 +4,31 @@ plugins {
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
localPropertiesFile.withReader('UTF-8') { reader ->
localProperties.load(reader)
}
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
}

def flutterVersionName = localProperties.getProperty('flutter.versionName')
if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

android {
namespace "com.gmail.hukusuke1007.stop_watch_timer_example"
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion
namespace = "com.gmail.hukusuke1007.stop_watch_timer_example"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

lintOptions {
disable 'InvalidPackage'
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8
}

defaultConfig {
applicationId "com.gmail.hukusuke1007.stop_watch_timer_example"
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
applicationId = "com.gmail.hukusuke1007.stop_watch_timer_example"
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

buildTypes {
release {
signingConfig signingConfigs.debug
signingConfig = signingConfigs.debug
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
android.enableR8=true
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion example/ios/Runner/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import UIKit
import Flutter

@UIApplicationMain
@main
@objc class AppDelegate: FlutterAppDelegate {
override func application(
_ application: UIApplication,
Expand Down
Loading

0 comments on commit 258da0b

Please sign in to comment.