Skip to content

Commit

Permalink
Feature/downgrade (#15)
Browse files Browse the repository at this point in the history
* Setup fvm and downgrade version
* Update docs
* Downgrade a gradle structure
* Update version to 0.6.2
  • Loading branch information
meg4cyberc4t authored Mar 13, 2024
1 parent 0122b65 commit 2f7c1c7
Show file tree
Hide file tree
Showing 18 changed files with 51 additions and 56 deletions.
4 changes: 4 additions & 0 deletions .fvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"flutter": "3.10.0",
"flavors": {}
}
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ doc/api/

.flutter-plugins
.flutter-plugins-dependencies

# FVM Version Cache
.fvm/
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"dart.flutterSdkPath": ".fvm/versions/3.10.0"
}
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.6.2

- Downgrade of a minimum Dart version to 3.0.0.
- Updated docs.

## 0.6.1

- Added methods getUserId, updateUserId, getDeviceId, updateDeviceId for user analytics.
Expand Down
1 change: 0 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ linter:
literal_only_boolean_expressions: true
matching_super_parameters: true
no_literal_bool_comparisons: true
no_self_assignments: true
prefer_final_parameters: true
prefer_int_literals: true
prefer_spread_collections: true
Expand Down
4 changes: 2 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'

android {
if (project.android.hasProperty("namespace")) {
if (project.android.hasProperty('namespace')) {
namespace 'com.example.varioqub_configs'
}

Expand All @@ -46,7 +46,7 @@ android {
}

defaultConfig {
minSdkVersion 19
minSdkVersion 16
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion example/analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ linter:
literal_only_boolean_expressions: true
matching_super_parameters: true
no_literal_bool_comparisons: true
no_self_assignments: true
prefer_final_parameters: true
prefer_int_literals: true
prefer_spread_collections: true
Expand Down
27 changes: 12 additions & 15 deletions example/android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,3 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -12,6 +6,11 @@ if (localPropertiesFile.exists()) {
}
}

def flutterRoot = localProperties.getProperty('flutter.sdk')
if (flutterRoot == null) {
throw new GradleException('Flutter SDK not found. Define location with flutter.sdk in the local.properties file.')
}

def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -22,8 +21,12 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.example.varioqub_configs_example"
namespace 'com.example.varioqub_configs_example'
compileSdkVersion flutter.compileSdkVersion
ndkVersion flutter.ndkVersion

Expand All @@ -41,21 +44,15 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.varioqub_configs_example"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
applicationId 'com.example.varioqub_configs_example'
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
multiDexEnabled true
}

buildTypes {
release {
// TODO: Add your own signing config for the release build.
// Signing with the debug keys for now, so `flutter run --release` works.
signingConfig signingConfigs.debug
}
}
Expand All @@ -66,5 +63,5 @@ flutter {
}

dependencies {
implementation 'com.android.support:multidex:1.0.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
3 changes: 2 additions & 1 deletion example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.3.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -25,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

tasks.register("clean", Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
34 changes: 8 additions & 26 deletions example/android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
pluginManagement {
def flutterSdkPath = {
def properties = new Properties()
file("local.properties").withInputStream { properties.load(it) }
def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
return flutterSdkPath
}
settings.ext.flutterSdkPath = flutterSdkPath()
include ':app'

includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
def localPropertiesFile = new File(rootProject.projectDir, 'local.properties')
def properties = new Properties()

repositories {
google()
mavenCentral()
gradlePluginPortal()
}
assert localPropertiesFile.exists()
localPropertiesFile.withReader('UTF-8') { reader -> properties.load(reader) }

plugins {
id "dev.flutter.flutter-gradle-plugin" version "1.0.0" apply false
}
}

plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version '7.4.2' apply false
}

include ":app"
def flutterSdkPath = properties.getProperty('flutter.sdk')
assert flutterSdkPath != null, 'flutter.sdk not set in local.properties'
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
8 changes: 4 additions & 4 deletions example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ PODS:
- Varioqub/Core (0.6.0):
- Varioqub/VQSwiftProtobuf
- Varioqub/VQSwiftProtobuf (0.6.0)
- varioqub_configs (0.6.1):
- varioqub_configs (0.6.2):
- Flutter
- Varioqub (~> 0.6)

Expand All @@ -24,10 +24,10 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/varioqub_configs/ios"

SPEC CHECKSUMS:
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
Varioqub: 58ac5ff3e51a46aca97c3a9c9f3b5cc9d5bf949e
varioqub_configs: 3bc95e7b23152922bf18d365c009bff6cff00c7b
varioqub_configs: ba296842ea16a0fddafa1a354873309667ee4f3b

PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796

COCOAPODS: 1.15.0
COCOAPODS: 1.15.2
2 changes: 1 addition & 1 deletion example/ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = YES;
LastUpgradeCheck = 1430;
LastUpgradeCheck = 1300;
ORGANIZATIONNAME = "";
TargetAttributes = {
331C8080294A63A400263BE5 = {
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 = "1430"
LastUpgradeVersion = "1300"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: "Demonstrates how to use the varioqub_configs plugin."
publish_to: "none"

environment:
sdk: '>=3.2.0 <4.0.0'
sdk: ">=3.0.0 <4.0.0"

dependencies:
flutter:
Expand Down
2 changes: 1 addition & 1 deletion ios/varioqub_configs.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
Pod::Spec.new do |s|
s.name = 'varioqub_configs'
s.version = '0.6.1'
s.version = '0.6.2'
s.summary = 'Flutter plugin providing work with remote configs,experiments and A/B testing via Varioqub.'
s.description = <<-DESC
Flutter plugin providing work with remote configs,
Expand Down
1 change: 1 addition & 0 deletions lib/src/build_settings/build_settings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ final class BuildSettings {
/// Classes for authorization in Varioqub
/// {@endtemplate}
sealed class VarioqubClient {
/// {@macro VarioqubClient}
const VarioqubClient();

/// Authorization in Varioqub via AppMetrica
Expand Down
1 change: 1 addition & 0 deletions lib/src/platform/varioqub.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:varioqub_configs/varioqub_configs.dart';
/// experiments and A/B testing via Varioqub.
/// {@endtemplate}
abstract interface class VarioqubConfigs {
/// {@macro VarioqubConfigs}
factory VarioqubConfigs() => _VarioqubPlatform();

/// Initializing settings for VarioqubConfigs
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: varioqub_configs
description: "Flutter plugin providing work with remote configs, experiments and A/B testing via Varioqub"
version: 0.6.1
version: 0.6.2
repository: https://github.com/meg4cyberc4t/varioqub_configs
homepage: https://github.com/meg4cyberc4t/varioqub_configs
issue_tracker: https://github.com/meg4cyberc4t/varioqub_configs/issues
topics: ["varioqub", "configs", "experiments"]

environment:
sdk: ">=3.2.0 <4.0.0"
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.3.0"

dependencies:
Expand Down

0 comments on commit 2f7c1c7

Please sign in to comment.