flutter_package / flutter_wakelock

Go to a project
Toggle navigation Toggle navigation pinning
creativecreatorormaybenot
Committed by GitHub
ac03ea47 1 parent 29fc4fd0

Upgrade Android embedding (#163) 

* Upgrade Android embedding

* Update workflows

* Upgrade target SDK
Inline Side-by-side
Showing 10 changed files with 16 additions and 20 deletions
@@ -24,7 +24,6 @@ jobs: @@ -24,7 +24,6 @@ jobs:
24 channel: 24 channel:
25 - 'stable' 25 - 'stable'
26 - 'beta' 26 - 'beta'
27 - - 'dev'  
28 package: 27 package:
29 - 'wakelock' 28 - 'wakelock'
30 - 'wakelock_macos' 29 - 'wakelock_macos'
@@ -57,7 +56,6 @@ jobs: @@ -57,7 +56,6 @@ jobs:
57 channel: 56 channel:
58 - 'stable' 57 - 'stable'
59 - 'beta' 58 - 'beta'
60 - - 'dev'  
61 package: 59 package:
62 - 'wakelock' 60 - 'wakelock'
63 - 'wakelock_macos' 61 - 'wakelock_macos'
@@ -102,7 +100,7 @@ jobs: @@ -102,7 +100,7 @@ jobs:
102 cd wakelock/example 100 cd wakelock/example
103 flutter drive --driver=test_driver/integration_test.dart --target=integration_test/wakelock_test.dart 101 flutter drive --driver=test_driver/integration_test.dart --target=integration_test/wakelock_test.dart
104 - name: Integration tests on macOS 102 - name: Integration tests on macOS
105 - if: matrix.package == 'wakelock_macos' && matrix.channel == 'dev' 103 + if: matrix.package == 'wakelock_macos'
106 run: | 104 run: |
107 cd wakelock/example 105 cd wakelock/example
108 flutter config --enable-macos-desktop 106 flutter config --enable-macos-desktop
  1 +## 0.6.0
  2 +
  3 +* Upgraded Android embedding.
  4 +
1 ## 0.5.6 5 ## 0.5.6
2 6
3 * Fixed platform interface incompatibility by bumping the version constraint. 7 * Fixed platform interface incompatibility by bumping the version constraint.
@@ -2,14 +2,14 @@ group 'creativemaybeno.wakelock' @@ -2,14 +2,14 @@ group 'creativemaybeno.wakelock'
2 version '1.0-SNAPSHOT' 2 version '1.0-SNAPSHOT'
3 3
4 buildscript { 4 buildscript {
5 - ext.kotlin_version = '1.3.50' 5 + ext.kotlin_version = '1.5.31'
6 repositories { 6 repositories {
7 google() 7 google()
8 mavenCentral() 8 mavenCentral()
9 } 9 }
10 10
11 dependencies { 11 dependencies {
12 - classpath 'com.android.tools.build:gradle:3.5.0' 12 + classpath 'com.android.tools.build:gradle:4.1.0'
13 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 13 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
14 } 14 }
15 } 15 }
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
2 distributionPath=wrapper/dists 2 distributionPath=wrapper/dists
3 zipStoreBase=GRADLE_USER_HOME 3 zipStoreBase=GRADLE_USER_HOME
4 zipStorePath=wrapper/dists 4 zipStorePath=wrapper/dists
5 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip 5 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
@@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android'
26 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" 26 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27 27
28 android { 28 android {
29 - compileSdkVersion 29 29 + compileSdkVersion 31
30 30
31 sourceSets { 31 sourceSets {
32 main.java.srcDirs += 'src/main/kotlin' 32 main.java.srcDirs += 'src/main/kotlin'
@@ -40,7 +40,7 @@ android { @@ -40,7 +40,7 @@ android {
40 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). 40 // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
41 applicationId "creativemaybeno.wakelock_example" 41 applicationId "creativemaybeno.wakelock_example"
42 minSdkVersion 16 42 minSdkVersion 16
43 - targetSdkVersion 29 43 + targetSdkVersion 31
44 versionCode flutterVersionCode.toInteger() 44 versionCode flutterVersionCode.toInteger()
45 versionName flutterVersionName 45 versionName flutterVersionName
46 } 46 }
@@ -6,11 +6,11 @@ @@ -6,11 +6,11 @@
6 additional functionality it is fine to subclass or reimplement 6 additional functionality it is fine to subclass or reimplement
7 FlutterApplication and put your custom class here. --> 7 FlutterApplication and put your custom class here. -->
8 <application 8 <application
9 - android:name="io.flutter.app.FlutterApplication" 9 + android:name="${applicationName}"
10 android:label="wakelock_example" 10 android:label="wakelock_example"
11 android:icon="@mipmap/ic_launcher"> 11 android:icon="@mipmap/ic_launcher">
12 <activity 12 <activity
13 - android:name=".MainActivity" 13 + android:name="io.flutter.embedding.android.FlutterActivity"
14 android:launchMode="singleTop" 14 android:launchMode="singleTop"
15 android:theme="@style/LaunchTheme" 15 android:theme="@style/LaunchTheme"
16 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" 16 android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1 -package creativemaybeno.wakelock_example  
2 -  
3 -import io.flutter.embedding.android.FlutterActivity  
4 -  
5 -class MainActivity: FlutterActivity() {  
6 -}  
1 buildscript { 1 buildscript {
2 - ext.kotlin_version = '1.3.50' 2 + ext.kotlin_version = '1.5.31'
3 repositories { 3 repositories {
4 google() 4 google()
5 mavenCentral() 5 mavenCentral()
6 } 6 }
7 7
8 dependencies { 8 dependencies {
9 - classpath 'com.android.tools.build:gradle:3.5.0' 9 + classpath 'com.android.tools.build:gradle:4.1.0'
10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" 10 classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11 } 11 }
12 } 12 }
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
3 distributionPath=wrapper/dists 3 distributionPath=wrapper/dists
4 zipStoreBase=GRADLE_USER_HOME 4 zipStoreBase=GRADLE_USER_HOME
5 zipStorePath=wrapper/dists 5 zipStorePath=wrapper/dists
6 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip 6 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
@@ -2,7 +2,7 @@ name: wakelock @@ -2,7 +2,7 @@ name: wakelock
2 description: >-2 2 description: >-2
3 Plugin that allows you to keep the device screen awake, i.e. prevent the screen from sleeping on 3 Plugin that allows you to keep the device screen awake, i.e. prevent the screen from sleeping on
4 Android, iOS, macOS, Windows, and web. 4 Android, iOS, macOS, Windows, and web.
5 -version: 0.5.6 5 +version: 0.6.0
6 repository: https://github.com/creativecreatorormaybenot/wakelock/tree/main/wakelock 6 repository: https://github.com/creativecreatorormaybenot/wakelock/tree/main/wakelock
7 7
8 environment: 8 environment: