Skip to content

Commit c7d3973

Browse files
authored
Merge pull request #25 from BrowserStackCE/android-project-upgrade
Android project upgrade
2 parents c42aa85 + 9dd88de commit c7d3973

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

example/android/app/build.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
id "dev.flutter.flutter-gradle-plugin"
5+
}
16
def localProperties = new Properties()
27
def localPropertiesFile = rootProject.file('local.properties')
38
if (localPropertiesFile.exists()) {
@@ -6,11 +11,6 @@ if (localPropertiesFile.exists()) {
611
}
712
}
813

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-
1414
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
1515
if (flutterVersionCode == null) {
1616
flutterVersionCode = '1'
@@ -21,17 +21,14 @@ if (flutterVersionName == null) {
2121
flutterVersionName = '1.0'
2222
}
2323

24-
apply plugin: 'com.android.application'
25-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
26-
2724
android {
2825
compileSdkVersion 35
2926
namespace "com.browserstack.fluttersystemproxy.flutter_system_proxy_example"
3027
defaultConfig {
3128
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
3229
applicationId "com.browserstack.fluttersystemproxy.flutter_system_proxy_example"
3330
minSdkVersion flutter.minSdkVersion
34-
targetSdkVersion 30
31+
targetSdkVersion 33
3532
versionCode flutterVersionCode.toInteger()
3633
versionName flutterVersionName
3734
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
android:theme="@style/LaunchTheme"
1111
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
1212
android:hardwareAccelerated="true"
13-
android:windowSoftInputMode="adjustResize">
13+
android:windowSoftInputMode="adjustResize"
14+
android:exported="false">
1415
<!-- Specifies an Android theme to apply to this Activity as soon as
1516
the Android process has started. This theme is visible to the user
1617
while the Flutter UI initializes. After that, this theme continues

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-
jcenter()
5-
}
6-
7-
dependencies {
8-
classpath 'com.android.tools.build:gradle:8.6.0'
9-
}
10-
}
11-
121
allprojects {
132
repositories {
143
google()

example/android/settings.gradle

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
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.0"
21+
id "com.android.application" version "8.6.0" apply false
22+
id "org.jetbrains.kotlin.android" version "1.9.22" apply false
23+
}
24+
include ':app'

0 commit comments

Comments
 (0)