Skip to content

Commit fad688e

Browse files
authored
Merge pull request #1298 from carp-dk/cp34
Screen State Release 5.0.1
2 parents 98bede7 + bebc8fe commit fad688e

25 files changed

Lines changed: 264 additions & 154 deletions

packages/screen_state/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 5.0.1
2+
3+
* Fix app not running on Flutter 3.44.X
4+
* Fix privacy manifest issue on iOS.
5+
* Update minimum iOS version to 15.0.
6+
17
## 5.0.0
28

39
* Update to kotlin 2.2.2

packages/screen_state/android/build.gradle

Lines changed: 0 additions & 67 deletions
This file was deleted.
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
group = "dk.cachet.screen_state"
2+
version = "5.0.1"
3+
4+
buildscript {
5+
val kotlinVersion = "2.3.20"
6+
repositories {
7+
google()
8+
mavenCentral()
9+
}
10+
11+
dependencies {
12+
classpath("com.android.tools.build:gradle:9.0.1")
13+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
14+
}
15+
}
16+
17+
allprojects {
18+
repositories {
19+
google()
20+
mavenCentral()
21+
}
22+
}
23+
24+
plugins {
25+
id("com.android.library")
26+
}
27+
28+
android {
29+
namespace = "dk.cachet.screen_state"
30+
31+
compileSdk = 36
32+
33+
compileOptions {
34+
sourceCompatibility = JavaVersion.VERSION_17
35+
targetCompatibility = JavaVersion.VERSION_17
36+
}
37+
38+
sourceSets {
39+
getByName("main") {
40+
java.srcDirs("src/main/kotlin")
41+
}
42+
getByName("test") {
43+
java.srcDirs("src/test/kotlin")
44+
}
45+
}
46+
47+
defaultConfig {
48+
minSdk = 24
49+
}
50+
51+
testOptions {
52+
unitTests {
53+
isIncludeAndroidResources = true
54+
all {
55+
it.useJUnitPlatform()
56+
57+
it.outputs.upToDateWhen { false }
58+
59+
it.testLogging {
60+
events("passed", "skipped", "failed", "standardOut", "standardError")
61+
showStandardStreams = true
62+
}
63+
}
64+
}
65+
}
66+
}
67+
68+
kotlin {
69+
compilerOptions {
70+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
71+
}
72+
}
73+
74+
dependencies {
75+
testImplementation("org.jetbrains.kotlin:kotlin-test")
76+
testImplementation("org.mockito:mockito-core:5.0.0")
77+
}

packages/screen_state/android/settings.gradle

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rootProject.name = "screen_state"

packages/screen_state/example/android/app/build.gradle renamed to packages/screen_state/example/android/app/build.gradle.kts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
plugins {
2-
id "com.android.application"
3-
id "kotlin-android"
2+
id("com.android.application")
43
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5-
id "dev.flutter.flutter-gradle-plugin"
4+
id("dev.flutter.flutter-gradle-plugin")
65
}
76

87
android {
9-
namespace = "com.example.example"
8+
namespace = "dk.cachet.screen_state_example"
109
compileSdk = flutter.compileSdkVersion
1110
ndkVersion = flutter.ndkVersion
1211

@@ -15,13 +14,9 @@ android {
1514
targetCompatibility = JavaVersion.VERSION_17
1615
}
1716

18-
kotlinOptions {
19-
jvmTarget = JavaVersion.VERSION_17.toString()
20-
}
21-
2217
defaultConfig {
2318
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
24-
applicationId = "com.example.example"
19+
applicationId = "dk.cachet.screen_state_example"
2520
// You can update the following values to match your application needs.
2621
// For more information, see: https://flutter.dev/to/review-gradle-config.
2722
minSdk = flutter.minSdkVersion
@@ -34,11 +29,17 @@ android {
3429
release {
3530
// TODO: Add your own signing config for the release build.
3631
// Signing with the debug keys for now, so `flutter run --release` works.
37-
signingConfig = signingConfigs.debug
32+
signingConfig = signingConfigs.getByName("debug")
3833
}
3934
}
4035
}
4136

37+
kotlin {
38+
compilerOptions {
39+
jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17
40+
}
41+
}
42+
4243
flutter {
4344
source = "../.."
4445
}

packages/screen_state/example/android/app/src/main/AndroidManifest.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
android:name=".MainActivity"
88
android:exported="true"
99
android:launchMode="singleTop"
10+
android:taskAffinity=""
1011
android:theme="@style/LaunchTheme"
1112
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1213
android:hardwareAccelerated="true"
@@ -30,4 +31,15 @@
3031
android:name="flutterEmbedding"
3132
android:value="2" />
3233
</application>
34+
<!-- Required to query activities that can process text, see:
35+
https://developer.android.com/training/package-visibility and
36+
https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
37+
38+
In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
39+
<queries>
40+
<intent>
41+
<action android:name="android.intent.action.PROCESS_TEXT"/>
42+
<data android:mimeType="text/plain"/>
43+
</intent>
44+
</queries>
3345
</manifest>

packages/screen_state/example/android/app/src/main/kotlin/com/example/example/MainActivity.kt

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package dk.cachet.screen_state_example
2+
3+
import io.flutter.embedding.android.FlutterActivity
4+
5+
class MainActivity : FlutterActivity()

packages/screen_state/example/android/build.gradle

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)