Skip to content

Commit a355914

Browse files
jeremykojeremyko
committed
Merge branch 'vespr-wallet-agp8'
2 parents af86a42 + aaada63 commit a355914

File tree

15 files changed

+169
-108
lines changed

15 files changed

+169
-108
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
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‎

Lines changed: 20 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/workspace.xml‎

Lines changed: 61 additions & 33 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎android/build.gradle‎

Lines changed: 15 additions & 6 deletions
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‎

Lines changed: 3 additions & 2 deletions
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‎

Lines changed: 2 additions & 0 deletions
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‎

Lines changed: 10 additions & 1 deletion
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‎

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="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‎

Lines changed: 8 additions & 5 deletions
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‎

Lines changed: 2 additions & 2 deletions
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

0 commit comments

Comments
 (0)