Skip to content

Commit 187cab0

Browse files
committed
Merge remote-tracking branch 'robotoss/master'
# Conflicts: # flutter_keyboard_visibility_temp_fork/android/build.gradle
2 parents 90acab2 + 1fd23e5 commit 187cab0

File tree

1 file changed

+38
-6
lines changed

1 file changed

+38
-6
lines changed

flutter_keyboard_visibility_temp_fork/android/build.gradle

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,29 @@ group 'com.jrai.flutter_keyboard_visibility_temp_fork'
22
version '1.0'
33

44
buildscript {
5+
ext.kotlin_version = "1.8.22"
56
repositories {
67
google()
78
mavenCentral()
89
}
910

1011
dependencies {
11-
classpath 'com.android.tools.build:gradle:7.4.2'
12+
classpath("com.android.tools.build:gradle:8.1.0")
13+
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1214
}
1315
}
1416

15-
rootProject.allprojects {
17+
allprojects {
1618
repositories {
1719
google()
1820
mavenCentral()
1921
}
2022
}
2123

22-
apply plugin: 'com.android.library'
24+
apply plugin: "com.android.library"
25+
apply plugin: "kotlin-android"
2326

2427
android {
25-
// Conditional for compatibility with AGP <4.2.
2628
if (project.android.hasProperty("namespace")) {
2729
namespace 'com.jrai.flutter_keyboard_visibility_temp_fork'
2830
}
@@ -38,7 +40,37 @@ android {
3840
}
3941

4042
compileOptions {
41-
sourceCompatibility JavaVersion.VERSION_1_8
42-
targetCompatibility JavaVersion.VERSION_1_8
43+
sourceCompatibility = JavaVersion.VERSION_1_8
44+
targetCompatibility = JavaVersion.VERSION_1_8
45+
}
46+
47+
kotlinOptions {
48+
jvmTarget = JavaVersion.VERSION_1_8
49+
}
50+
51+
sourceSets {
52+
main.java.srcDirs += "src/main/kotlin"
53+
test.java.srcDirs += "src/test/kotlin"
54+
}
55+
56+
defaultConfig {
57+
minSdk = 21
58+
}
59+
60+
dependencies {
61+
testImplementation("org.jetbrains.kotlin:kotlin-test")
62+
testImplementation("org.mockito:mockito-core:5.0.0")
63+
}
64+
65+
testOptions {
66+
unitTests.all {
67+
useJUnitPlatform()
68+
69+
testLogging {
70+
events "passed", "skipped", "failed", "standardOut", "standardError"
71+
outputs.upToDateWhen {false}
72+
showStandardStreams = true
73+
}
74+
}
4375
}
4476
}

0 commit comments

Comments
 (0)