Update packages and enable null safety (#76)

* Update Libraries and move to android embedded v2 * update packages * downgrade pedantic * update sdk version * Update spotify_sdk.yml * remove flutter upper bound * remove unneccessary changes * Update spotify_sdk.yml * downgrade packages * Update spotify_sdk.yml * donwgrade cupertino icons * revert changes from flutter beta * fix dartformat * readd automatically added changes * Update spotify_sdk.yml * Update spotify_sdk.yml * update packages to null safety * update gitignore * extend analysis options * add nodoc to imageextension * update packages to the latest null safety previews * revert sdk change * update to null safety * Remove dead code * update models * update version to use a prerelease * Fix multiple version issue for dio * update changelog to represent null safety * Perform minor null safety improvements (#82) * Upgrade gradle and remove obsolete r8 * Update Android Manifest to be android 11 ready * Update gradle and remove unused variable on android side * Update to latest libraries * update dio and fix authtoken error * Improve null-safety on the web (#85) * Made web implementation more null-safe. * Further null-safety improvements * . * Migrate to newer js library * Fix error where the authorization screen would sometimes not communicate correctly with the plugin. * Update pubspec.yaml * Update changelog and readme Co-authored-by: Foti Dim <[email protected]> Co-authored-by: Mateusz Rębacz <[email protected]>
brim-borium · Apr 2, 2021 · 1dbddc7 · 1dbddc7
1 parent 49a8cd7
commit 1dbddc7
Show file tree

Hide file tree

Showing 25 changed files with 331 additions and 325 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,3 +46,4 @@ build/
 /.vs/spotify_sdk/v16/.suo
 
 SpotifyiOS.framework
+**/doc/api/
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0
+* BREAKING: opt into null safety
+* upgrade Dart SDK constraints to >=2.12.0-0 <3.0.0
+
 ## 1.0.2
 * fixes image dimension exception on getImage
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # spotify_sdk
 
-[![pub package](https://img.shields.io/badge/pub-1.0.2-orange)](https://pub.dev/packages/spotify_sdk)
+[![pub package](https://img.shields.io/badge/pub-2.0.0-orange)](https://pub.dev/packages/spotify_sdk)
 [![build](https://github.com/brim-borium/spotify_sdk/workflows/spotify_sdk/badge.svg?branch=master)](https://github.com/brim-borium/spotify_sdk/actions?query=workflow%3Aspotify_sdk)
 [![licence](https://img.shields.io/badge/licence-MIT-blue.svg)](https://github.com/IamTobi/spotify_sdk/blob/master/LICENSE)
 

diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -3,12 +3,11 @@ include: package:pedantic/analysis_options.yaml
 analyzer:
   exclude:
     # Ignore generated files
-    - '**/*.g.dart'
-    - 'lib/generated/**'
-    - 'lib/models/**'
+    - "**/*.g.dart"
+    - "lib/generated/**"
+    - "lib/models/**"
   errors:
     close_sinks: ignore
-
 linter:
   rules:
-    unsafe_html: false
+    unsafe_html: false
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -5,4 +5,7 @@
             android:name="com.spotify.sdk.android.authentication.LoginActivity"
             android:theme="@android:style/Theme.Translucent.NoTitleBar" />
     </application>
+    <queries>
+        <package android:name="com.spotify.music" />
+    </queries>
 </manifest>
diff --git a/android/src/main/kotlin/de/minimalme/spotify_sdk/SpotifySdkPlugin.kt b/android/src/main/kotlin/de/minimalme/spotify_sdk/SpotifySdkPlugin.kt
@@ -166,7 +166,6 @@ class SpotifySdkPlugin(private val registrar: Registrar) : MethodCallHandler, Pl
                     .setRedirectUri(redirectUrl)
                     .showAuthView(true)
                     .build()
-            var replySubmitted = false
             SpotifyAppRemote.disconnect(spotifyAppRemote)
             var initiallyConnected = false
             SpotifyAppRemote.connect(registrar.context(), connectionParams,
@@ -183,7 +182,6 @@ class SpotifySdkPlugin(private val registrar: Registrar) : MethodCallHandler, Pl
                             connStatusEventChannel(ConnectionStatusChannel.ConnectionEvent(true, "Successfully connected to Spotify.", null, null))
                             // method success
                             result.success(true)
-                            replySubmitted = true
                         }
 
                         override fun onFailure(throwable: Throwable) {
@@ -251,7 +249,7 @@ class SpotifySdkPlugin(private val registrar: Registrar) : MethodCallHandler, Pl
 
     private fun getAuthenticationToken(clientId: String?, redirectUrl: String?, scope: String?, result: Result) {
         if (registrar.activity() == null) {
-            throw IllegalStateException("connectToSpotify needs a foreground activity")
+            throw IllegalStateException("getAuthenticationToken needs a foreground activity")
         }
 
         if (clientId.isNullOrBlank() || redirectUrl.isNullOrBlank()) {

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -6,7 +6,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/example/android/gradle.properties b/example/android/gradle.properties
@@ -1,4 +1,3 @@
 org.gradle.jvmargs=-Xmx1536M
 android.useAndroidX=true
 android.enableJetifier=true
-android.enableR8=true
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -49,9 +49,9 @@ class _HomeState extends State<Home> {
               title: const Text('SpotifySdk Example'),
               actions: [
                 _connected
-                    ? TextButton(
+                    ? IconButton(
                         onPressed: disconnect,
-                        child: const Text('Disconnect'),
+                        icon: Icon(Icons.exit_to_app),
                       )
                     : Container()
               ],

diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -8,14 +8,14 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  logger: ^0.9.3
+  logger: ^1.0.0
   flutter_dotenv: ^3.1.0
   cupertino_icons: ^1.0.0
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  pedantic: ^1.9.2
+  pedantic: ^1.11.0
   spotify_sdk:
     path: ../
 

diff --git a/lib/extensions/image_dimension_extension.dart b/lib/extensions/image_dimension_extension.dart
@@ -1,8 +1,10 @@
 import 'package:spotify_sdk/enums/image_dimension_enum.dart';
 
 ///Extension for formatting the ImageDimension enum to value
+///@nodoc
 extension ImageDimensionExtension on ImageDimension {
   ///maps the value to the specified enum
+  ///@nodoc
   static const values = {
     ImageDimension.large: 720,
     ImageDimension.medium: 480,
@@ -12,5 +14,6 @@ extension ImageDimensionExtension on ImageDimension {
   };
 
   /// returns the value
-  int get value => values[this];
+  ///@nodoc
+  int get value => values[this]!;
 }
diff --git a/lib/models/capabilities.dart b/lib/models/capabilities.dart
@@ -1,12 +1,11 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:flutter/foundation.dart';
 
 part 'capabilities.g.dart';
 
 @JsonSerializable()
 class Capabilities {
   Capabilities({
-    @required this.canPlayOnDemand,
+    required this.canPlayOnDemand,
   });
 
   @JsonKey(name: 'can_play_on_demand')

diff --git a/lib/models/connection_status.dart b/lib/models/connection_status.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 part 'connection_status.g.dart';
@@ -9,7 +8,7 @@ class ConnectionStatus {
     this.message,
     this.errorCode,
     this.errorDetails, {
-    @required this.connected,
+    required this.connected,
   });
 
   @JsonKey(name: 'connected')
@@ -23,7 +22,7 @@ class ConnectionStatus {
 
   @JsonKey(ignore: true)
   bool hasError() {
-    return errorCode?.isNotEmpty == true;
+    return errorCode.isNotEmpty == true;
   }
 
   factory ConnectionStatus.fromJson(Map<String, dynamic> json) =>

diff --git a/lib/models/crossfade_state.dart b/lib/models/crossfade_state.dart
@@ -1,13 +1,12 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:flutter/foundation.dart';
 
 part 'crossfade_state.g.dart';
 
 @JsonSerializable()
 class CrossfadeState {
   CrossfadeState(
     this.duration, {
-    @required this.isEnabled,
+    required this.isEnabled,
   });
 
   final bool isEnabled;

diff --git a/lib/models/library_state.dart b/lib/models/library_state.dart
@@ -1,14 +1,13 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:flutter/foundation.dart';
 
 part 'library_state.g.dart';
 
 @JsonSerializable()
 class LibraryState {
   LibraryState(
     this.uri, {
-    @required this.isSaved,
-    @required this.canSave,
+    required this.isSaved,
+    required this.canSave,
   });
 
   @JsonKey(name: 'uri')

diff --git a/lib/models/player_options.dart b/lib/models/player_options.dart
@@ -1,13 +1,12 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:flutter/foundation.dart';
 
 part 'player_options.g.dart';
 
 @JsonSerializable()
 class PlayerOptions {
   PlayerOptions(
     this.repeatMode, {
-    @required this.isShuffling,
+    required this.isShuffling,
   });
 
   @JsonKey(name: 'shuffle')

diff --git a/lib/models/player_options.g.dart b/lib/models/player_options.g.dart
diff --git a/lib/models/player_restrictions.dart b/lib/models/player_restrictions.dart
@@ -1,17 +1,16 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:flutter/foundation.dart';
 
 part 'player_restrictions.g.dart';
 
 @JsonSerializable()
 class PlayerRestrictions {
   PlayerRestrictions({
-    @required this.canSkipNext,
-    @required this.canSkipPrevious,
-    @required this.canRepeatTrack,
-    @required this.canRepeatContext,
-    @required this.canToggleShuffle,
-    @required this.canSeek,
+    required this.canSkipNext,
+    required this.canSkipPrevious,
+    required this.canRepeatTrack,
+    required this.canRepeatContext,
+    required this.canToggleShuffle,
+    required this.canSeek,
   });
 
   @JsonKey(name: 'can_skip_next')

diff --git a/lib/models/player_state.dart b/lib/models/player_state.dart
@@ -1,5 +1,5 @@
 import 'package:json_annotation/json_annotation.dart';
-import 'package:flutter/foundation.dart';
+
 import 'player_options.dart';
 import 'player_restrictions.dart';
 import 'track.dart';
@@ -14,10 +14,10 @@ class PlayerState {
     this.playbackPosition,
     this.playbackOptions,
     this.playbackRestrictions, {
-    @required this.isPaused,
+    required this.isPaused,
   });
 
-  final Track track;
+  final Track? track;
   @JsonKey(name: 'is_paused')
   final bool isPaused;
   @JsonKey(name: 'playback_speed')

diff --git a/lib/models/player_state.g.dart b/lib/models/player_state.g.dart
diff --git a/lib/models/track.dart b/lib/models/track.dart
@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:json_annotation/json_annotation.dart';
 
 import 'album.dart';
@@ -17,8 +16,8 @@ class Track {
     this.imageUri,
     this.name,
     this.uri, {
-    @required this.isEpisode,
-    @required this.isPodcast,
+    required this.isEpisode,
+    required this.isPodcast,
   });
 
   final Album album;

diff --git a/lib/models/track.g.dart b/lib/models/track.g.dart