Skip to content

Commit d55909b

Browse files
committed
Increased target sdk for android
1 parent fedaf63 commit d55909b

File tree

4 files changed

+64
-63
lines changed

4 files changed

+64
-63
lines changed

android/build.gradle

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,30 +31,30 @@ rootProject.allprojects {
3131
}
3232

3333
android {
34-
namespace = "com.nimroddayan.flutternsd"
35-
compileSdkVersion 35
36-
37-
compileOptions {
38-
sourceCompatibility = JavaVersion.VERSION_11
39-
targetCompatibility = JavaVersion.VERSION_11
40-
}
41-
42-
kotlinOptions {
43-
jvmTarget = JavaVersion.VERSION_11
44-
}
45-
46-
sourceSets {
47-
main.java.srcDirs += "src/main/kotlin"
48-
test.java.srcDirs += "src/test/kotlin"
49-
}
50-
51-
defaultConfig {
52-
minSdk = 21
53-
}
34+
namespace = "com.nimroddayan.flutternsd"
35+
compileSdkVersion 35
36+
37+
compileOptions {
38+
sourceCompatibility = JavaVersion.VERSION_11
39+
targetCompatibility = JavaVersion.VERSION_11
40+
}
41+
42+
kotlinOptions {
43+
jvmTarget = JavaVersion.VERSION_11
44+
}
45+
46+
sourceSets {
47+
main.java.srcDirs += "src/main/kotlin"
48+
test.java.srcDirs += "src/test/kotlin"
49+
}
50+
51+
defaultConfig {
52+
minSdk = 21
53+
}
5454
}
5555

5656
dependencies {
57-
implementation 'com.jakewharton.timber:timber:4.7.1'
58-
testImplementation("org.jetbrains.kotlin:kotlin-test")
59-
testImplementation("org.mockito:mockito-core:5.0.0")
57+
implementation 'com.jakewharton.timber:timber:4.7.1'
58+
testImplementation("org.jetbrains.kotlin:kotlin-test")
59+
testImplementation("org.mockito:mockito-core:5.0.0")
6060
}

example/android/app/build.gradle

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,61 +24,61 @@ plugins {
2424
def localProperties = new Properties()
2525
def localPropertiesFile = rootProject.file('local.properties')
2626
if (localPropertiesFile.exists()) {
27-
localPropertiesFile.withReader('UTF-8') { reader ->
28-
localProperties.load(reader)
29-
}
27+
localPropertiesFile.withReader('UTF-8') { reader ->
28+
localProperties.load(reader)
29+
}
3030
}
3131

3232
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
3333
if (flutterVersionCode == null) {
34-
flutterVersionCode = '1'
34+
flutterVersionCode = '1'
3535
}
3636

3737
def flutterVersionName = localProperties.getProperty('flutter.versionName')
3838
if (flutterVersionName == null) {
39-
flutterVersionName = '1.0'
39+
flutterVersionName = '1.0'
4040
}
4141

4242
android {
43-
namespace = "com.nimroddayan.flutternsd.example"
44-
compileSdkVersion 35
43+
namespace = "com.nimroddayan.flutternsd.example"
44+
compileSdkVersion 35
4545

46-
sourceSets {
47-
main.java.srcDirs += 'src/main/kotlin'
48-
}
46+
sourceSets {
47+
main.java.srcDirs += 'src/main/kotlin'
48+
}
4949

50-
lintOptions {
51-
disable 'InvalidPackage'
52-
}
50+
lintOptions {
51+
disable 'InvalidPackage'
52+
}
5353

54-
defaultConfig {
55-
applicationId "com.nimroddayan.flutternsd.example"
56-
minSdkVersion 23
57-
targetSdkVersion 29
58-
versionCode flutterVersionCode.toInteger()
59-
versionName flutterVersionName
60-
}
54+
defaultConfig {
55+
applicationId "com.nimroddayan.flutternsd.example"
56+
minSdkVersion flutter.minSdkVersion
57+
targetSdkVersion flutter.targetSdkVersion
58+
versionCode flutterVersionCode.toInteger()
59+
versionName flutterVersionName
60+
}
6161

62-
buildTypes {
63-
release {
64-
signingConfig signingConfigs.debug
65-
}
62+
buildTypes {
63+
release {
64+
signingConfig signingConfigs.debug
6665
}
66+
}
6767

68-
compileOptions {
69-
sourceCompatibility = JavaVersion.VERSION_1_8
70-
targetCompatibility = JavaVersion.VERSION_1_8
71-
}
68+
compileOptions {
69+
sourceCompatibility = JavaVersion.VERSION_1_8
70+
targetCompatibility = JavaVersion.VERSION_1_8
71+
}
7272

73-
kotlinOptions {
74-
jvmTarget = "1.8"
75-
}
73+
kotlinOptions {
74+
jvmTarget = "1.8"
75+
}
7676
}
7777

7878
flutter {
79-
source '../..'
79+
source '../..'
8080
}
8181

8282
dependencies {
83-
implementation 'com.jakewharton.timber:timber:4.7.1'
83+
implementation 'com.jakewharton.timber:timber:4.7.1'
8484
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
android:icon="@mipmap/ic_launcher">
2828
<activity
2929
android:name=".MainActivity"
30+
android:exported="true"
3031
android:launchMode="singleTop"
3132
android:theme="@style/LaunchTheme"
3233
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"

example/android/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
*/
1717

1818
allprojects {
19-
repositories {
20-
google()
21-
mavenCentral()
22-
}
19+
repositories {
20+
google()
21+
mavenCentral()
22+
}
2323
}
2424

2525
rootProject.buildDir = '../build'
2626
subprojects {
27-
project.buildDir = "${rootProject.buildDir}/${project.name}"
27+
project.buildDir = "${rootProject.buildDir}/${project.name}"
2828
}
2929
subprojects {
30-
project.evaluationDependsOn(':app')
30+
project.evaluationDependsOn(':app')
3131
}
3232

3333
tasks.register("clean", Delete) {
34-
delete rootProject.buildDir
34+
delete rootProject.buildDir
3535
}

0 commit comments

Comments
 (0)