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.

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

Update the development enviroment #189

Merged
merged 3 commits into from
Mar 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion flutter_custom_tabs/example/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_custom_tabs_ios: 62439c843b2691aae516fd50119a01eb9755fff7
flutter_custom_tabs_ios: a651b18786388923b62de8c0537607de87c2eccf

PODFILE CHECKSUM: 7368163408c647b7eb699d0d788ba6718e18fb8d

Expand Down
6 changes: 3 additions & 3 deletions flutter_custom_tabs/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ description: Demonstrates how to use the flutter_custom_tabs plugin.
publish_to: none

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"

dependencies:
flutter:
Expand All @@ -17,7 +17,7 @@ dependencies:
dev_dependencies:
flutter_test:
sdk: flutter
flutter_lints: ^2.0.1
flutter_lints: ^3.0.1

flutter:
uses-material-design: true
12 changes: 6 additions & 6 deletions flutter_custom_tabs/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ repository: https://github.com/droibit/flutter_custom_tabs/tree/main/flutter_cus
publish_to: none

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"

dependencies:
flutter:
Expand All @@ -24,14 +24,14 @@ dependencies:
# flutter_custom_tabs_web: ^2.0.0
flutter_custom_tabs_web:
path: ../flutter_custom_tabs_web
meta: ^1.9.1
meta: ^1.10.0

dev_dependencies:
flutter_test:
sdk: flutter
mockito: ^5.4.2
flutter_lints: ^2.0.1
plugin_platform_interface: ^2.1.5
mockito: ^5.4.4
flutter_lints: ^3.0.1
plugin_platform_interface: ^2.1.7

flutter:
plugin:
Expand Down
2 changes: 1 addition & 1 deletion flutter_custom_tabs_android/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ android {

dependencies {
implementation 'androidx.browser:browser:1.5.0'
implementation 'com.github.droibit:customtabslauncher:2.0.0-rc01'
implementation 'com.github.droibit:customtabslauncher:2.0.0'

testImplementation 'junit:junit:4.13.2'
testImplementation 'org.robolectric:robolectric:4.10.3'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
// Autogenerated from Pigeon (v14.0.0), do not edit directly.
// Autogenerated from Pigeon (v17.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon

package com.github.droibit.flutter.plugins.customtabs;

import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.CLASS;

import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand All @@ -11,6 +14,8 @@
import io.flutter.plugin.common.MessageCodec;
import io.flutter.plugin.common.StandardMessageCodec;
import java.io.ByteArrayOutputStream;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
Expand Down Expand Up @@ -57,6 +62,10 @@ protected static ArrayList<Object> wrapError(@NonNull Throwable exception) {
return errorList;
}

@Target(METHOD)
@Retention(CLASS)
@interface CanIgnoreReturnValue {}

/** Generated class from Pigeon that represents data sent in messages. */
public static final class CustomTabsIntentOptions {
private @Nullable ColorSchemes colorSchemes;
Expand Down Expand Up @@ -153,62 +162,71 @@ public static final class Builder {

private @Nullable ColorSchemes colorSchemes;

@CanIgnoreReturnValue
public @NonNull Builder setColorSchemes(@Nullable ColorSchemes setterArg) {
this.colorSchemes = setterArg;
return this;
}

private @Nullable Boolean urlBarHidingEnabled;

@CanIgnoreReturnValue
public @NonNull Builder setUrlBarHidingEnabled(@Nullable Boolean setterArg) {
this.urlBarHidingEnabled = setterArg;
return this;
}

private @Nullable Long shareState;

@CanIgnoreReturnValue
public @NonNull Builder setShareState(@Nullable Long setterArg) {
this.shareState = setterArg;
return this;
}

private @Nullable Boolean showTitle;

@CanIgnoreReturnValue
public @NonNull Builder setShowTitle(@Nullable Boolean setterArg) {
this.showTitle = setterArg;
return this;
}

private @Nullable Boolean instantAppsEnabled;

@CanIgnoreReturnValue
public @NonNull Builder setInstantAppsEnabled(@Nullable Boolean setterArg) {
this.instantAppsEnabled = setterArg;
return this;
}

private @Nullable CloseButton closeButton;

@CanIgnoreReturnValue
public @NonNull Builder setCloseButton(@Nullable CloseButton setterArg) {
this.closeButton = setterArg;
return this;
}

private @Nullable Animations animations;

@CanIgnoreReturnValue
public @NonNull Builder setAnimations(@Nullable Animations setterArg) {
this.animations = setterArg;
return this;
}

private @Nullable BrowserConfiguration browser;

@CanIgnoreReturnValue
public @NonNull Builder setBrowser(@Nullable BrowserConfiguration setterArg) {
this.browser = setterArg;
return this;
}

private @Nullable PartialConfiguration partial;

@CanIgnoreReturnValue
public @NonNull Builder setPartial(@Nullable PartialConfiguration setterArg) {
this.partial = setterArg;
return this;
Expand Down Expand Up @@ -314,27 +332,31 @@ public static final class Builder {

private @Nullable String startEnter;

@CanIgnoreReturnValue
public @NonNull Builder setStartEnter(@Nullable String setterArg) {
this.startEnter = setterArg;
return this;
}

private @Nullable String startExit;

@CanIgnoreReturnValue
public @NonNull Builder setStartExit(@Nullable String setterArg) {
this.startExit = setterArg;
return this;
}

private @Nullable String endEnter;

@CanIgnoreReturnValue
public @NonNull Builder setEndEnter(@Nullable String setterArg) {
this.endEnter = setterArg;
return this;
}

private @Nullable String endExit;

@CanIgnoreReturnValue
public @NonNull Builder setEndExit(@Nullable String setterArg) {
this.endExit = setterArg;
return this;
Expand Down Expand Up @@ -426,27 +448,31 @@ public static final class Builder {

private @Nullable Boolean prefersExternalBrowser;

@CanIgnoreReturnValue
public @NonNull Builder setPrefersExternalBrowser(@NonNull Boolean setterArg) {
this.prefersExternalBrowser = setterArg;
return this;
}

private @Nullable Boolean prefersDefaultBrowser;

@CanIgnoreReturnValue
public @NonNull Builder setPrefersDefaultBrowser(@Nullable Boolean setterArg) {
this.prefersDefaultBrowser = setterArg;
return this;
}

private @Nullable List<String> fallbackCustomTabs;

@CanIgnoreReturnValue
public @NonNull Builder setFallbackCustomTabs(@Nullable List<String> setterArg) {
this.fallbackCustomTabs = setterArg;
return this;
}

private @Nullable Map<String, String> headers;

@CanIgnoreReturnValue
public @NonNull Builder setHeaders(@Nullable Map<String, String> setterArg) {
this.headers = setterArg;
return this;
Expand Down Expand Up @@ -512,13 +538,15 @@ public static final class Builder {

private @Nullable String icon;

@CanIgnoreReturnValue
public @NonNull Builder setIcon(@Nullable String setterArg) {
this.icon = setterArg;
return this;
}

private @Nullable Long position;

@CanIgnoreReturnValue
public @NonNull Builder setPosition(@Nullable Long setterArg) {
this.position = setterArg;
return this;
Expand Down Expand Up @@ -596,27 +624,31 @@ public static final class Builder {

private @Nullable Long colorScheme;

@CanIgnoreReturnValue
public @NonNull Builder setColorScheme(@Nullable Long setterArg) {
this.colorScheme = setterArg;
return this;
}

private @Nullable ColorSchemeParams lightParams;

@CanIgnoreReturnValue
public @NonNull Builder setLightParams(@Nullable ColorSchemeParams setterArg) {
this.lightParams = setterArg;
return this;
}

private @Nullable ColorSchemeParams darkParams;

@CanIgnoreReturnValue
public @NonNull Builder setDarkParams(@Nullable ColorSchemeParams setterArg) {
this.darkParams = setterArg;
return this;
}

private @Nullable ColorSchemeParams defaultPrams;

@CanIgnoreReturnValue
public @NonNull Builder setDefaultPrams(@Nullable ColorSchemeParams setterArg) {
this.defaultPrams = setterArg;
return this;
Expand Down Expand Up @@ -692,20 +724,23 @@ public static final class Builder {

private @Nullable Long toolbarColor;

@CanIgnoreReturnValue
public @NonNull Builder setToolbarColor(@Nullable Long setterArg) {
this.toolbarColor = setterArg;
return this;
}

private @Nullable Long navigationBarColor;

@CanIgnoreReturnValue
public @NonNull Builder setNavigationBarColor(@Nullable Long setterArg) {
this.navigationBarColor = setterArg;
return this;
}

private @Nullable Long navigationBarDividerColor;

@CanIgnoreReturnValue
public @NonNull Builder setNavigationBarDividerColor(@Nullable Long setterArg) {
this.navigationBarDividerColor = setterArg;
return this;
Expand Down Expand Up @@ -786,20 +821,23 @@ public static final class Builder {

private @Nullable Double initialHeight;

@CanIgnoreReturnValue
public @NonNull Builder setInitialHeight(@NonNull Double setterArg) {
this.initialHeight = setterArg;
return this;
}

private @Nullable Long activityHeightResizeBehavior;

@CanIgnoreReturnValue
public @NonNull Builder setActivityHeightResizeBehavior(@NonNull Long setterArg) {
this.activityHeightResizeBehavior = setterArg;
return this;
}

private @Nullable Long cornerRadius;

@CanIgnoreReturnValue
public @NonNull Builder setCornerRadius(@Nullable Long setterArg) {
this.cornerRadius = setterArg;
return this;
Expand Down
6 changes: 2 additions & 4 deletions flutter_custom_tabs_android/example/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,9 @@ android {
}

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.github.droibit.plugins.flutter.customtabs.flutter_custom_tabs_android_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.
minSdk flutter.minSdkVersion
// Enable multidex support.
minSdk 21 //flutter.minSdkVersion
targetSdk flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
2 changes: 1 addition & 1 deletion flutter_custom_tabs_android/example/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:8.1.1'
classpath 'com.android.tools.build:gradle:8.1.4'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
8 changes: 4 additions & 4 deletions flutter_custom_tabs_android/example/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ description: Demonstrates how to use the flutter_custom_tabs_android plugin.
publish_to: 'none'

environment:
sdk: ">=2.17.0 <4.0.0"
flutter: ">=3.0.0"
sdk: ">=3.0.0 <4.0.0"
flutter: ">=3.10.0"

dependencies:
flutter:
sdk: flutter
flutter_custom_tabs_android:
path: ../
dynamic_color: ^1.6.7
dynamic_color: ^1.7.0

dev_dependencies:
integration_test:
sdk: flutter
flutter_test:
sdk: flutter
flutter_lints: ^2.0.1
flutter_lints: ^3.0.1

flutter:
uses-material-design: true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Autogenerated from Pigeon (v14.0.0), do not edit directly.
// Autogenerated from Pigeon (v17.1.1), do not edit directly.
// See also: https://pub.dev/packages/pigeon
// ignore_for_file: public_member_api_docs, non_constant_identifier_names, avoid_as, unused_import, unnecessary_parenthesis, prefer_null_aware_operators, omit_local_variable_types, unused_shown_name, unnecessary_import, no_leading_underscores_for_local_identifiers

Expand Down
Loading