Skip to content

Commit

Permalink
periodical cleanup (#952)
Browse files Browse the repository at this point in the history
  • Loading branch information
bartekpacia authored Jan 23, 2025
1 parent 1ea4c4c commit 1f7e328
Show file tree
Hide file tree
Showing 18 changed files with 87 additions and 88 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/location-prepare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
flutter-version: ["3.22.x"]
flutter-version: ["3.27.x"]

steps:
- name: Clone repository
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: 3.22.x
flutter-version: 3.27.x

- name: Set up Java
uses: actions/setup-java@v4
Expand All @@ -80,7 +80,7 @@ jobs:
- name: Set up Flutter
uses: subosito/flutter-action@v2
with:
flutter-version: 3.22.x
flutter-version: 3.27.x

- name: Install tools
run: brew install clang-format
Expand Down
39 changes: 22 additions & 17 deletions packages/location/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ buildscript {
}

dependencies {
classpath "com.android.tools.build:gradle:8.3.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23"
classpath "org.jlleitschuh.gradle:ktlint-gradle:11.5.0"
classpath("com.android.tools.build:gradle:8.8.0")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.0")
classpath("org.jlleitschuh.gradle:ktlint-gradle:11.5.0")
}
}

Expand All @@ -21,31 +21,36 @@ repositories {
}

apply plugin: "com.android.library"
apply plugin: "kotlin-android"
apply plugin: "org.jetbrains.kotlin.android"
apply plugin: "org.jlleitschuh.gradle.ktlint"

android {
namespace = "com.lyokone.location"
compileSdk = 34

defaultConfig {
minSdk = 21
}
compileSdk = 35

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "1.8"
allWarningsAsErrors = true
jvmTarget = "11"
// allWarningsAsErrors = true // TODO(bartekpacia): Re-enable
}

sourceSets {
main.java.srcDirs += "src/main/kotlin"
test.java.srcDirs += "src/test/kotlin"
}

defaultConfig {
minSdk = 21
targetSdk = 35
}
}

dependencies {
compileOnly "androidx.annotation:annotation:1.6.0"

api "com.google.android.gms:play-services-location:21.2.0"
implementation "androidx.core:core-ktx:1.10.1"
compileOnly("androidx.annotation:annotation:1.6.0")
implementation("androidx.core:core-ktx:1.13.1")
api("com.google.android.gms:play-services-location:21.3.0")
}
38 changes: 12 additions & 26 deletions packages/location/example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,42 +1,28 @@
plugins {
id "com.android.application"
id "dev.flutter.flutter-gradle-plugin"
id "org.jetbrains.kotlin.android"
}

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"
id "dev.flutter.flutter-gradle-plugin"
}

android {
compileSdk = 34
compileSdk = flutter.compileSdkVersion
namespace = "com.lyokone.location.example"

defaultConfig {
applicationId = "com.lyokone.location.example"
minSdk = 21
targetSdk = 34
versionCode = flutterVersionCode.toInteger()
versionName = flutterVersionName
minSdk = flutter.minSdkVersion
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlinOptions {
jvmTarget = "11"
}

buildTypes {
Expand Down
9 changes: 2 additions & 7 deletions packages/location/example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
allprojects {
repositories {
google()
mavenCentral()
}
}

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-all.zip
8 changes: 4 additions & 4 deletions packages/location/example/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ pluginManagement {
}

plugins {
id "dev.flutter.flutter-plugin-loader"
id "com.android.application" version "8.3.1" apply false
id "org.jetbrains.kotlin.android" version "1.9.23" apply false
id("dev.flutter.flutter-plugin-loader")
id("com.android.application") version("8.8.0") apply false
id("org.jetbrains.kotlin.android") version("2.1.0") apply false
}

include ":app"
include(":app")
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<key>CFBundleVersion</key>
<string>1.0</string>
<key>MinimumOSVersion</key>
<string>11.0</string>
<string>12.0</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion packages/location/example/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Uncomment this line to define a global platform for your project
# platform :ios, '11.0'
# platform :ios, '12.0'

# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@
97C146E61CF9000F007C117D /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 1300;
LastUpgradeCheck = 1510;
ORGANIZATIONNAME = "The Chromium Authors";
TargetAttributes = {
97C146ED1CF9000F007C117D = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1300"
LastUpgradeVersion = "1510"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion packages/location/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
8 changes: 4 additions & 4 deletions packages/location/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ publish_to: none
version: 1.0.0+1

environment:
sdk: ">=3.1.0 <4.0.0"
flutter: ">=3.16.0"
sdk: ">=3.6.0 <4.0.0"
flutter: ">=3.27.0"

dependencies:
flutter:
sdk: flutter
location:
path: ../
url_launcher: ^6.2.5
url_launcher: ^6.3.1

dev_dependencies:
leancode_lint: ^3.0.0
leancode_lint: ^15.0.0

flutter:
uses-material-design: true
10 changes: 5 additions & 5 deletions packages/location/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ repository: https://github.com/Lyokone/flutterlocation
issue_tracker: https://github.com/Lyokone/flutterlocation/issues

environment:
sdk: ">=3.4.0 <4.0.0"
flutter: ">=3.22.0"
sdk: ">=3.6.0 <4.0.0"
flutter: ">=3.27.0"

flutter:
plugin:
Expand All @@ -29,8 +29,8 @@ dependencies:
location_web: ^5.0.4
dev_dependencies:
async: ^2.11.0
build_runner: ^2.4.11
build_runner: ^2.4.14
flutter_test:
sdk: flutter
leancode_lint: ^13.0.0
mockito: ^5.4.4
leancode_lint: ^15.0.0
mockito: ^5.4.5
14 changes: 10 additions & 4 deletions packages/location_platform_interface/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
## 6.0.0

- Bump dependencies (#952)
- Bump minimum Dart version to 3.6, minimum Flutter version to 3.27

## 5.0.0

- Bump minimum Dart version to 3.4, minimum Flutter version to 3.22
- Bump dependencies
- Bump dependencies (#964)
- Bump minimum Dart version to 3.4, minimum Flutter version to 3.22

## 4.0.0

- Bump minimum Dart version to 3.1, minimum Flutter version to 3.16
- Bump dependencies
- Bump dependencies (#937)
- Bump minimum Dart version to 3.1, minimum Flutter version to 3.16


## 3.1.2

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,8 @@ class MethodChannelLocation extends LocationPlatform {
}

if (color != null) {
// Not sure what to replace this with.
// ignore: deprecated_member_use
data['color'] = '#${color.value.toRadixString(16)}';
}

Expand Down
12 changes: 6 additions & 6 deletions packages/location_platform_interface/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: location_platform_interface
description: A common platform interface for the location plugin.
version: 5.0.0
version: 6.0.0
homepage: https://github.com/Lyokone/flutterlocation

environment:
sdk: ">=3.4.0 <4.0.0"
flutter: ">=3.22.0"
sdk: ">=3.6.0 <4.0.0"
flutter: ">=3.27.0"

dependencies:
flutter:
Expand All @@ -14,8 +14,8 @@ dependencies:

dev_dependencies:
async: ^2.11.0
build_runner: ^2.4.11
build_runner: ^2.4.14
flutter_test:
sdk: flutter
leancode_lint: ^13.0.0
mockito: ^5.4.4
leancode_lint: ^15.0.0
mockito: ^5.4.5
5 changes: 5 additions & 0 deletions packages/location_web/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 6.0.0

- Bump minimum Dart version to 3.6, minimum Flutter version to 3.27 (#952)
- Bump dependency on `package: web` to `^1.1.0`

## 5.0.5

- Remove dependency on `js`
Expand Down
12 changes: 6 additions & 6 deletions packages/location_web/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
name: location_web
description: The web implementation of the location plugin.
version: 5.0.5
version: 6.0.0
homepage: https://github.com/Lyokone/flutterlocation
repository: https://github.com/Lyokone/flutterlocation
issue_tracker: https://github.com/Lyokone/flutterlocation/issues

environment:
sdk: ">=3.4.0 <4.0.0"
flutter: ">=3.22.0"
sdk: ">=3.6.0 <4.0.0"
flutter: ">=3.27.0"

dependencies:
flutter:
sdk: flutter
flutter_web_plugins:
sdk: flutter
http_parser: ^4.0.0
http_parser: ^4.1.0
location_platform_interface: ^5.0.0
web: ^1.0.0
web: ^1.1.0

dev_dependencies:
flutter_test:
sdk: flutter
mockito: ^5.4.4
mockito: ^5.4.5

flutter:
plugin:
Expand Down

0 comments on commit 1f7e328

Please sign in to comment.