Skip to content

Commit aaada63

Browse files
jeremykojeremyko
committed
Merge branch 'agp8' of https://github.com/vespr-wallet/flutter-proximity-sensor-plugin into vespr-wallet-agp8
2 parents af86a42 + eb2b1c7 commit aaada63

15 files changed

+169
-108
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
.packages
55
.pub/
66
android/.idea/
7+
.idea/
78

89
build/

‎.idea/libraries/Dart_SDK.xml

+20-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml

+61-33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/build.gradle

+15-6
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,47 @@ group 'dev.jeremyko.proximity_sensor'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.7.20'
5+
ext.kotlin_version = '1.8.22'
66
repositories {
77
google()
8-
jcenter()
8+
mavenCentral()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:4.1.3'
12+
classpath 'com.android.tools.build:gradle:8.1.0'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}
1616

1717
rootProject.allprojects {
1818
repositories {
1919
google()
20-
jcenter()
20+
mavenCentral()
2121
}
2222
}
2323

2424
apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28-
compileSdkVersion 30
28+
compileSdkVersion 31
2929
if (project.android.hasProperty('namespace')) {
3030
namespace 'dev.jeremyko.proximity_sensor'
3131
}
32+
3233
sourceSets {
3334
main.java.srcDirs += 'src/main/kotlin'
3435
}
3536
defaultConfig {
36-
minSdkVersion 16
37+
namespace "dev.jeremyko.proximity_sensor"
38+
minSdkVersion 23
39+
}
40+
compileOptions {
41+
sourceCompatibility JavaVersion.VERSION_17
42+
targetCompatibility JavaVersion.VERSION_17
43+
}
44+
kotlinOptions {
45+
jvmTarget = '17'
3746
}
3847
}
3948

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

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Wed Jan 25 12:09:51 EET 2023
12
distributionBase=GRADLE_USER_HOME
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
24
distributionPath=wrapper/dists
3-
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
zipStoreBase=GRADLE_USER_HOME

‎android/src/main/AndroidManifest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
12
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
23
package="dev.jeremyko.proximity_sensor">
34
<uses-permission android:name="android.hardware.sensor.proximity"/>
45
<uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND"/>
56
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION"/>
67
<uses-permission android:name="android.permission.WAKE_LOCK"/>
8+
79
</manifest>

‎example/android/app/build.gradle

+10-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ android {
3535
defaultConfig {
3636
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3737
applicationId "dev.jeremyko.proximity_sensor_example"
38-
minSdkVersion 16
38+
namespace "dev.jeremyko.proximity_sensor_example"
39+
minSdkVersion 23
3940
targetSdkVersion 31
4041
versionCode flutterVersionCode.toInteger()
4142
versionName flutterVersionName
@@ -48,6 +49,14 @@ android {
4849
signingConfig signingConfigs.debug
4950
}
5051
}
52+
53+
compileOptions {
54+
sourceCompatibility JavaVersion.VERSION_17
55+
targetCompatibility JavaVersion.VERSION_17
56+
}
57+
kotlinOptions {
58+
jvmTarget = '17'
59+
}
5160
}
5261

5362
flutter {

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

+1-2
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="dev.jeremyko.proximity_sensor_example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<uses-permission android:name="android.hardware.sensor.proximity"/>
43
<uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND"/>
54
<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION"/>

‎example/android/build.gradle

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1+
group 'dev.jeremyko.proximity_sensor_example'
2+
version '1.0-SNAPSHOT'
3+
14
buildscript {
2-
ext.kotlin_version = '1.7.20'
5+
ext.kotlin_version = '1.8.22'
36
repositories {
47
google()
5-
jcenter()
8+
mavenCentral()
69
}
710

811
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.1.2'
12+
classpath 'com.android.tools.build:gradle:8.1.0'
1013
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1114
}
1215
}
1316

1417
allprojects {
1518
repositories {
1619
google()
17-
jcenter()
20+
mavenCentral()
1821
}
1922
}
2023

@@ -26,6 +29,6 @@ subprojects {
2629
project.evaluationDependsOn(':app')
2730
}
2831

29-
task clean(type: Delete) {
32+
tasks.register("clean", Delete) {
3033
delete rootProject.buildDir
3134
}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Fri Jun 23 08:50:38 CEST 2017
1+
#Wed Jan 25 12:09:51 EET 2023
22
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.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

‎example/pubspec.lock

+17-17
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ packages:
4545
dependency: "direct main"
4646
description:
4747
name: cupertino_icons
48-
sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d
48+
sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6
4949
url: "https://pub.dev"
5050
source: hosted
51-
version: "1.0.6"
51+
version: "1.0.8"
5252
fake_async:
5353
dependency: transitive
5454
description:
@@ -71,26 +71,26 @@ packages:
7171
dependency: transitive
7272
description:
7373
name: leak_tracker
74-
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
74+
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
7575
url: "https://pub.dev"
7676
source: hosted
77-
version: "10.0.0"
77+
version: "10.0.4"
7878
leak_tracker_flutter_testing:
7979
dependency: transitive
8080
description:
8181
name: leak_tracker_flutter_testing
82-
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
82+
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
8383
url: "https://pub.dev"
8484
source: hosted
85-
version: "2.0.1"
85+
version: "3.0.3"
8686
leak_tracker_testing:
8787
dependency: transitive
8888
description:
8989
name: leak_tracker_testing
90-
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
90+
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
9191
url: "https://pub.dev"
9292
source: hosted
93-
version: "2.0.1"
93+
version: "3.0.1"
9494
matcher:
9595
dependency: transitive
9696
description:
@@ -111,10 +111,10 @@ packages:
111111
dependency: transitive
112112
description:
113113
name: meta
114-
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
114+
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
115115
url: "https://pub.dev"
116116
source: hosted
117-
version: "1.11.0"
117+
version: "1.12.0"
118118
path:
119119
dependency: transitive
120120
description:
@@ -129,7 +129,7 @@ packages:
129129
path: ".."
130130
relative: true
131131
source: path
132-
version: "1.2.0"
132+
version: "1.3.1"
133133
sky_engine:
134134
dependency: transitive
135135
description: flutter
@@ -179,10 +179,10 @@ packages:
179179
dependency: transitive
180180
description:
181181
name: test_api
182-
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
182+
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
183183
url: "https://pub.dev"
184184
source: hosted
185-
version: "0.6.1"
185+
version: "0.7.0"
186186
vector_math:
187187
dependency: transitive
188188
description:
@@ -195,10 +195,10 @@ packages:
195195
dependency: transitive
196196
description:
197197
name: vm_service
198-
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
198+
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
199199
url: "https://pub.dev"
200200
source: hosted
201-
version: "13.0.0"
201+
version: "14.2.1"
202202
sdks:
203-
dart: ">=3.2.0-0 <4.0.0"
204-
flutter: ">=1.20.0"
203+
dart: ">=3.3.0 <4.0.0"
204+
flutter: ">=3.18.0-18.0.pre.54"

0 commit comments

Comments
 (0)