Merge pull request #92 from OneSignal/plugin-rename

jkasten2 · web-flow · commit 15e0b89bd028 · 2019-07-22T14:57:54.000-07:00
Plugin rename, Update Android version, and Gradle version
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'dart:async';
 
 //import OneSignal
-import 'package:onesignal/onesignal.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 
 void main() => runApp(new MyApp());
 
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -13,7 +13,7 @@ dev_dependencies:
     sdk: flutter
     
 
-  onesignal:
+  onesignal_flutter:
     path: ../
 
 # For information on the generic Dart part of this file, see the
diff --git a/ios/onesignal_flutter.podspec b/ios/onesignal_flutter.podspec
@@ -2,8 +2,8 @@
 # To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
 #
 Pod::Spec.new do |s|
-  s.name             = 'onesignal'
-  s.version          = '1.0.5'
+  s.name             = 'onesignal_flutter'
+  s.version          = '2.0.0'
   s.summary          = 'The OneSignal Flutter SDK'
   s.description      = 'Allows you to easily add OneSignal to your flutter projects, to make sending and handling push notifications easy'
   s.homepage         = 'https://www.onesignal.com'
@@ -17,4 +17,3 @@ Pod::Spec.new do |s|
   s.ios.deployment_target = '8.0'
   s.static_framework = true
 end
-
diff --git a/lib/onesignal_flutter.dart b/lib/onesignal_flutter.dart
@@ -1,12 +1,12 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
-import 'package:onesignal/src/permission.dart';
-import 'package:onesignal/src/subscription.dart';
-import 'package:onesignal/src/defines.dart';
-import 'package:onesignal/src/utils.dart';
-import 'package:onesignal/src/notification.dart';
-import 'package:onesignal/src/create_notification.dart';
-import 'package:onesignal/src/in_app_message.dart';
+import 'package:onesignal_flutter/src/permission.dart';
+import 'package:onesignal_flutter/src/subscription.dart';
+import 'package:onesignal_flutter/src/defines.dart';
+import 'package:onesignal_flutter/src/utils.dart';
+import 'package:onesignal_flutter/src/notification.dart';
+import 'package:onesignal_flutter/src/create_notification.dart';
+import 'package:onesignal_flutter/src/in_app_message.dart';
 
 export 'src/notification.dart';
 export 'src/subscription.dart';
diff --git a/lib/src/create_notification.dart b/lib/src/create_notification.dart
@@ -1,7 +1,7 @@
-import 'package:onesignal/src/utils.dart';
+import 'package:onesignal_flutter/src/utils.dart';
 import 'package:flutter/foundation.dart';
-import 'package:onesignal/src/notification.dart';
-import 'package:onesignal/onesignal.dart';
+import 'package:onesignal_flutter/src/notification.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 
 /// The parameters & format to create push notifications is
 /// so different from receiving notifications that we represent
diff --git a/lib/src/defines.dart b/lib/src/defines.dart
@@ -1,4 +1,4 @@
-String sdkVersion = "0.1.0";
+String sdkVersion = "2.0.0";
 
 /// Determines how notifications should be displayed
 enum OSNotificationDisplayType { none, alert, notification }
diff --git a/lib/src/in_app_message.dart b/lib/src/in_app_message.dart
@@ -1,4 +1,4 @@
-import 'package:onesignal/src/utils.dart';
+import 'package:onesignal_flutter/src/utils.dart';
 
 /// When a click action is defined on an In App Message form the dashboard,
 /// the handler returns an OSInAppMessageAction object so the Dart code can act accordingly
diff --git a/lib/src/notification.dart b/lib/src/notification.dart
@@ -1,5 +1,5 @@
-import 'package:onesignal/src/defines.dart';
-import 'package:onesignal/src/utils.dart';
+import 'package:onesignal_flutter/src/defines.dart';
+import 'package:onesignal_flutter/src/utils.dart';
 import 'package:flutter/foundation.dart';
 import 'dart:convert';
 
diff --git a/lib/src/permission.dart b/lib/src/permission.dart
@@ -1,6 +1,6 @@
-import 'package:onesignal/src/subscription.dart';
-import 'package:onesignal/src/defines.dart';
-import 'package:onesignal/src/utils.dart';
+import 'package:onesignal_flutter/src/subscription.dart';
+import 'package:onesignal_flutter/src/defines.dart';
+import 'package:onesignal_flutter/src/utils.dart';
 
 class OSPermissionState extends JSONStringRepresentable {
   bool hasPrompted; // iOS only
diff --git a/lib/src/subscription.dart b/lib/src/subscription.dart
@@ -1,12 +1,12 @@
-import 'package:onesignal/src/utils.dart';
+import 'package:onesignal_flutter/src/utils.dart';
 
 /// Represents the current user's subscription state with OneSignal
 class OSSubscriptionState extends JSONStringRepresentable {
   /// Indicates if you have ever called setSubscription(false) to
   /// programmatically disable notifications for this user
   bool userSubscriptionSetting;
 
-  /// A boolean paramerer that indicates if the  user
+  /// A boolean parameter that indicates if the  user
   /// is subscribed to your app with OneSignal
   /// This is only true if the `userId`, `pushToken`, and
   /// `userSubscriptionSetting` parameters are defined/true.
diff --git a/lib/src/utils.dart b/lib/src/utils.dart
@@ -1,4 +1,4 @@
-import 'package:onesignal/src/defines.dart';
+import 'package:onesignal_flutter/src/defines.dart';
 import 'dart:convert';
 
 // produces a string like this: 2018-07-23T17:56:30.951030 UTC-7:00
diff --git a/onesignalflutter.iml b/onesignalflutter.iml
diff --git a/onesignalflutter_android.iml b/onesignalflutter_android.iml
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
-name: onesignal
+name: onesignal_flutter
 description: OneSignal is a free push notification service for mobile apps. This plugin makes it easy to integrate your flutter app with OneSignal
-version: 1.1.0
+version: 2.0.0
 author: Brad Hesse <brad@onesignal.com>, Josh Kasten <josh@onesignal.com>
 homepage: https://github.com/OneSignal/OneSignal-Flutter-SDK
 
@@ -20,4 +20,4 @@ dev_dependencies:
 
 environment:
   sdk: ">=2.0.0-dev.28.0 <3.0.0"
-  flutter: ">=0.1.4 <2.0.0"
+  flutter: ">=0.1.4 <2.0.0"
diff --git a/test.json b/test.json
diff --git a/test/mock_channel.dart b/test/mock_channel.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 import 'package:flutter/services.dart';
-import 'package:onesignal/onesignal.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 
 /*
   This class mocks an iOS or Android host device
diff --git a/test/notification_test.dart b/test/notification_test.dart
@@ -1,6 +1,6 @@
 import 'package:test/test.dart';
-import 'package:onesignal/src/notification.dart';
-import 'package:onesignal/src/defines.dart';
+import 'package:onesignal_flutter/src/notification.dart';
+import 'package:onesignal_flutter/src/defines.dart';
 import 'test_data.dart';
 
 void main() {
diff --git a/test/onesignalflutter_test.dart b/test/onesignalflutter_test.dart
@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:onesignal/onesignal.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 import 'mock_channel.dart';
 import 'test_data.dart';
 
diff --git a/test/permission_test.dart b/test/permission_test.dart
@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:onesignal/onesignal.dart';
+import 'package:onesignal_flutter/onesignal_flutter.dart';
 import 'test_data.dart';
 
 void main() {
diff --git a/test/subscription_test.dart b/test/subscription_test.dart
@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:onesignal/src/subscription.dart';
+import 'package:onesignal_flutter/src/subscription.dart';
 import 'test_data.dart';
 
 void main() {
diff --git a/test/test_data.dart b/test/test_data.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
-import 'package:onesignal/src/create_notification.dart';
-import 'package:onesignal/src/notification.dart';
-import 'package:onesignal/src/defines.dart';
+import 'package:onesignal_flutter/src/create_notification.dart';
+import 'package:onesignal_flutter/src/notification.dart';
+import 'package:onesignal_flutter/src/defines.dart';
 
 class TestData {
   static final file = new File(Directory.current.path + '/test.json');

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-String sdkVersion = "0.1.0";`
	`1`	`+String sdkVersion = "2.0.0";`
`2`	`2`
`3`	`3`	`/// Determines how notifications should be displayed`
`4`	`4`	`enum OSNotificationDisplayType { none, alert, notification }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import 'package:onesignal/src/utils.dart';`
	`1`	`+import 'package:onesignal_flutter/src/utils.dart';`
`2`	`2`
`3`	`3`	`/// When a click action is defined on an In App Message form the dashboard,`
`4`	`4`	`/// the handler returns an OSInAppMessageAction object so the Dart code can act accordingly`