Skip to content

Commit 37fed9f

Browse files
StrimeStrime
authored
Merge branch 'cph-cachet:master' into master
2 parents c343d11 + bf98e2f commit 37fed9f

File tree

146 files changed

+2994
-2249
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+2994
-2249
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
# CACHET Flutter plugins
1+
# CARP Flutter plugins
22

3-
This repo contains the source code for Flutter first-party plugins developed by developers at the [Copenhagen Center for Health Technology (CACHET)](http://www.cachet.dk/) at The Technical University of Denmark.
3+
This repo contains the source code for Flutter first-party plugins developed by developers at the [Copenhagen Research Platform (CARP)](http://www.carp.dk/) at The Technical University of Denmark.
44
Check the `packages` directory for all plugins.
55

66
Flutter plugins enable access to platform-specific APIs using a platform channel.
7-
For more information about plugins, and how to use them, see
7+
For more information about plugins and how to use them, see
88
[https://flutter.io/platform-plugins/](https://flutter.io/platform-plugins/).
99

1010
## Plugins

‎packages/activity_recognition_flutter/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

‎packages/activity_recognition_flutter/example/android/app/build.gradle

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
6+
17
def localProperties = new Properties()
28
def localPropertiesFile = rootProject.file('local.properties')
39
if (localPropertiesFile.exists()) {
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
612
}
713
}
814

9-
def flutterRoot = localProperties.getProperty('flutter.sdk')
10-
if (flutterRoot == null) {
11-
throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
12-
}
13-
1415
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1516
if (flutterVersionCode == null) {
1617
flutterVersionCode = '1'
@@ -21,11 +22,23 @@ if (flutterVersionName == null) {
2122
flutterVersionName = '1.0'
2223
}
2324

24-
apply plugin: 'com.android.application'
25-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26-
2725
android {
26+
namespace "dk.cachet.activity_recognition_flutter_example"
27+
testNamespace "dk.cachet.activity_recognition_flutter_example.test"
2828
compileSdkVersion flutter.compileSdkVersion
29+
30+
compileOptions {
31+
sourceCompatibility JavaVersion.VERSION_1_8
32+
targetCompatibility JavaVersion.VERSION_1_8
33+
}
34+
35+
kotlinOptions {
36+
jvmTarget = '1.8'
37+
}
38+
39+
sourceSets {
40+
main.java.srcDirs += 'src/main/kotlin'
41+
}
2942

3043
lintOptions {
3144
disable 'InvalidPackage'

‎packages/activity_recognition_flutter/example/android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="dk.cachet.activity_recognition_flutter_example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

‎packages/activity_recognition_flutter/example/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="dk.cachet.activity_recognition_flutter_example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
43
calls FlutterMain.startInitialization(this); in its onCreate method.
54
In most cases you can leave this as-is, but you if you want to provide

‎packages/activity_recognition_flutter/example/android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="dk.cachet.activity_recognition_flutter_example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

‎packages/activity_recognition_flutter/example/android/build.gradle

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
}
6-
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:7.3.0'
9-
}
10-
}
11-
121
allprojects {
132
repositories {
143
google()

‎packages/activity_recognition_flutter/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip

‎packages/activity_recognition_flutter/example/android/settings.gradle

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,25 @@
1-
include ':app'
1+
pluginManagement {
2+
def flutterSdkPath = {
3+
def properties = new Properties()
4+
file("local.properties").withInputStream { properties.load(it) }
5+
def flutterSdkPath = properties.getProperty("flutter.sdk")
6+
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
7+
return flutterSdkPath
8+
}()
29

3-
def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
4-
def properties = new Properties()
10+
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
511

6-
assert localPropertiesFile.exists()
7-
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
12+
repositories {
13+
google()
14+
mavenCentral()
15+
gradlePluginPortal()
16+
}
17+
}
818

9-
def flutterSdkPath = properties.getProperty("flutter.sdk")
10-
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
11-
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
19+
plugins {
20+
id "dev.flutter.flutter-plugin-loader" version "1.0.2"
21+
id "com.android.application" version '8.9.0' apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.20" apply false
23+
}
24+
25+
include ":app"

‎packages/activity_recognition_flutter/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎packages/activity_recognition_flutter/example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
# platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎packages/activity_recognition_flutter/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
97C146E61CF9000F007C117D /* Project object */ = {
156156
isa = PBXProject;
157157
attributes = {
158-
LastUpgradeCheck = 1300;
158+
LastUpgradeCheck = 1510;
159159
ORGANIZATIONNAME = "";
160160
TargetAttributes = {
161161
97C146ED1CF9000F007C117D = {

‎packages/activity_recognition_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -48,6 +48,7 @@
4848
ignoresPersistentStateOnLaunch = "NO"
4949
debugDocumentVersioning = "YES"
5050
debugServiceExtension = "internal"
51+
enableGPUValidationMode = "1"
5152
allowLocationSimulation = "YES">
5253
<BuildableProductRunnable
5354
runnableDebuggingMode = "0">

‎packages/activity_recognition_flutter/example/ios/Runner/AppDelegate.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import Flutter
33

4-
@UIApplicationMain
4+
@main
55
@objc class AppDelegate: FlutterAppDelegate {
66
override func application(
77
_ application: UIApplication,

‎packages/air_quality/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 4.1.1
2+
3+
- Upgrading ios version
4+
- Renaming example app id
5+
16
## 4.1.0
27

38
- major gradle upgrade

‎packages/air_quality/example/android/app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ if (flutterVersionName == null) {
2323
}
2424

2525
android {
26-
namespace "com.example.example"
27-
testNamespace "com.example.example.test"
26+
namespace "com.air_quality.example"
27+
testNamespace "com.air_quality.example.test"
2828
compileSdkVersion flutter.compileSdkVersion
2929

3030
compileOptions {
@@ -46,7 +46,7 @@ android {
4646

4747
defaultConfig {
4848
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
49-
applicationId "com.example.example"
49+
applicationId "com.air_quality.example"
5050
minSdkVersion flutter.minSdkVersion
5151
targetSdkVersion flutter.targetSdkVersion
5252
versionCode flutterVersionCode.toInteger()

‎packages/air_quality/example/android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" >
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.example.example
1+
package com.air_quality.example
22

33
import io.flutter.embedding.android.FlutterActivity
44

‎packages/air_quality/example/android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

‎packages/air_quality/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎packages/air_quality/example/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
97C146E61CF9000F007C117D /* Project object */ = {
136136
isa = PBXProject;
137137
attributes = {
138-
LastUpgradeCheck = 1300;
138+
LastUpgradeCheck = 1510;
139139
ORGANIZATIONNAME = "The Chromium Authors";
140140
TargetAttributes = {
141141
97C146ED1CF9000F007C117D = {
@@ -145,7 +145,7 @@
145145
};
146146
};
147147
buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */;
148-
compatibilityVersion = "Xcode 3.2";
148+
compatibilityVersion = "Xcode 12.0";
149149
developmentRegion = en;
150150
hasScannedForEncodings = 0;
151151
knownRegions = (
@@ -283,7 +283,7 @@
283283
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
284284
GCC_WARN_UNUSED_FUNCTION = YES;
285285
GCC_WARN_UNUSED_VARIABLE = YES;
286-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
286+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
287287
MTL_ENABLE_DEBUG_INFO = NO;
288288
SDKROOT = iphoneos;
289289
SUPPORTED_PLATFORMS = iphoneos;
@@ -299,18 +299,22 @@
299299
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
300300
CLANG_ENABLE_MODULES = YES;
301301
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
302+
DEVELOPMENT_TEAM = 59TCTNUBMQ;
302303
ENABLE_BITCODE = NO;
303304
FRAMEWORK_SEARCH_PATHS = (
304305
"$(inherited)",
305306
"$(PROJECT_DIR)/Flutter",
306307
);
307308
INFOPLIST_FILE = Runner/Info.plist;
308-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
309+
LD_RUNPATH_SEARCH_PATHS = (
310+
"$(inherited)",
311+
"@executable_path/Frameworks",
312+
);
309313
LIBRARY_SEARCH_PATHS = (
310314
"$(inherited)",
311315
"$(PROJECT_DIR)/Flutter",
312316
);
313-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
317+
PRODUCT_BUNDLE_IDENTIFIER = "com.air-quality.example";
314318
PRODUCT_NAME = "$(TARGET_NAME)";
315319
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
316320
SWIFT_VERSION = 5.0;
@@ -365,7 +369,7 @@
365369
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
366370
GCC_WARN_UNUSED_FUNCTION = YES;
367371
GCC_WARN_UNUSED_VARIABLE = YES;
368-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
372+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
369373
MTL_ENABLE_DEBUG_INFO = YES;
370374
ONLY_ACTIVE_ARCH = YES;
371375
SDKROOT = iphoneos;
@@ -414,7 +418,7 @@
414418
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
415419
GCC_WARN_UNUSED_FUNCTION = YES;
416420
GCC_WARN_UNUSED_VARIABLE = YES;
417-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
421+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
418422
MTL_ENABLE_DEBUG_INFO = NO;
419423
SDKROOT = iphoneos;
420424
SUPPORTED_PLATFORMS = iphoneos;
@@ -431,18 +435,22 @@
431435
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
432436
CLANG_ENABLE_MODULES = YES;
433437
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
438+
DEVELOPMENT_TEAM = 59TCTNUBMQ;
434439
ENABLE_BITCODE = NO;
435440
FRAMEWORK_SEARCH_PATHS = (
436441
"$(inherited)",
437442
"$(PROJECT_DIR)/Flutter",
438443
);
439444
INFOPLIST_FILE = Runner/Info.plist;
440-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
445+
LD_RUNPATH_SEARCH_PATHS = (
446+
"$(inherited)",
447+
"@executable_path/Frameworks",
448+
);
441449
LIBRARY_SEARCH_PATHS = (
442450
"$(inherited)",
443451
"$(PROJECT_DIR)/Flutter",
444452
);
445-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
453+
PRODUCT_BUNDLE_IDENTIFIER = "com.air-quality.example";
446454
PRODUCT_NAME = "$(TARGET_NAME)";
447455
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
448456
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -458,18 +466,22 @@
458466
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
459467
CLANG_ENABLE_MODULES = YES;
460468
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
469+
DEVELOPMENT_TEAM = 59TCTNUBMQ;
461470
ENABLE_BITCODE = NO;
462471
FRAMEWORK_SEARCH_PATHS = (
463472
"$(inherited)",
464473
"$(PROJECT_DIR)/Flutter",
465474
);
466475
INFOPLIST_FILE = Runner/Info.plist;
467-
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
476+
LD_RUNPATH_SEARCH_PATHS = (
477+
"$(inherited)",
478+
"@executable_path/Frameworks",
479+
);
468480
LIBRARY_SEARCH_PATHS = (
469481
"$(inherited)",
470482
"$(PROJECT_DIR)/Flutter",
471483
);
472-
PRODUCT_BUNDLE_IDENTIFIER = com.example.example;
484+
PRODUCT_BUNDLE_IDENTIFIER = "com.air-quality.example";
473485
PRODUCT_NAME = "$(TARGET_NAME)";
474486
SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
475487
SWIFT_VERSION = 5.0;

‎packages/air_quality/example/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>IDEDidComputeMac32BitWarning</key>
6+
<true/>
7+
</dict>
8+
</plist>

‎packages/air_quality/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1510"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -50,6 +50,7 @@
5050
ignoresPersistentStateOnLaunch = "NO"
5151
debugDocumentVersioning = "YES"
5252
debugServiceExtension = "internal"
53+
enableGPUValidationMode = "1"
5354
allowLocationSimulation = "YES">
5455
<BuildableProductRunnable
5556
runnableDebuggingMode = "0">

0 commit comments

Comments
 (0)