Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
ginkgo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vjrj
ginkgo
Commits
2bad435a
Commit
2bad435a
authored
11 months ago
by
vjrj
Browse files
Options
Downloads
Patches
Plain Diff
Apply of breaking changes of flutter-gradle-plugin-apply
parent
8394a008
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
android/app/build.gradle
+6
-12
6 additions, 12 deletions
android/app/build.gradle
android/build.gradle
+2
-13
2 additions, 13 deletions
android/build.gradle
android/settings.gradle
+22
-8
22 additions, 8 deletions
android/settings.gradle
with
30 additions
and
33 deletions
android/app/build.gradle
+
6
−
12
View file @
2bad435a
plugins
{
id
"com.android.application"
id
"kotlin-android"
id
"dev.flutter.flutter-gradle-plugin"
}
def
localProperties
=
new
Properties
()
def
localProperties
=
new
Properties
()
def
localPropertiesFile
=
rootProject
.
file
(
'local.properties'
)
def
localPropertiesFile
=
rootProject
.
file
(
'local.properties'
)
if
(
localPropertiesFile
.
exists
())
{
if
(
localPropertiesFile
.
exists
())
{
...
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
...
@@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) {
}
}
}
}
def
flutterRoot
=
localProperties
.
getProperty
(
'flutter.sdk'
)
if
(
flutterRoot
==
null
)
{
throw
new
GradleException
(
"Flutter SDK not found. Define location with flutter.sdk in the local.properties file."
)
}
def
flutterVersionCode
=
localProperties
.
getProperty
(
'flutter.versionCode'
)
def
flutterVersionCode
=
localProperties
.
getProperty
(
'flutter.versionCode'
)
if
(
flutterVersionCode
==
null
)
{
if
(
flutterVersionCode
==
null
)
{
flutterVersionCode
=
'1'
flutterVersionCode
=
'1'
...
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
...
@@ -21,10 +22,6 @@ if (flutterVersionName == null) {
flutterVersionName
=
'1.0'
flutterVersionName
=
'1.0'
}
}
apply
plugin:
'com.android.application'
apply
plugin:
'kotlin-android'
apply
from:
"$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android
{
android
{
compileSdkVersion
34
compileSdkVersion
34
...
@@ -54,6 +51,3 @@ flutter {
...
@@ -54,6 +51,3 @@ flutter {
source
'../..'
source
'../..'
}
}
dependencies
{
implementation
"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
}
This diff is collapsed.
Click to expand it.
android/build.gradle
+
2
−
13
View file @
2bad435a
buildscript
{
ext
.
kotlin_version
=
'1.8.20'
repositories
{
google
()
mavenCentral
()
}
dependencies
{
classpath
'com.android.tools.build:gradle:7.2.2'
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
allprojects
{
allprojects
{
repositories
{
repositories
{
google
()
google
()
...
@@ -21,6 +8,8 @@ allprojects {
...
@@ -21,6 +8,8 @@ allprojects {
rootProject
.
buildDir
=
'../build'
rootProject
.
buildDir
=
'../build'
subprojects
{
subprojects
{
project
.
buildDir
=
"${rootProject.buildDir}/${project.name}"
project
.
buildDir
=
"${rootProject.buildDir}/${project.name}"
}
subprojects
{
project
.
evaluationDependsOn
(
':app'
)
project
.
evaluationDependsOn
(
':app'
)
}
}
...
...
This diff is collapsed.
Click to expand it.
android/settings.gradle
+
22
−
8
View file @
2bad435a
include
':app'
pluginManagement
{
def
flutterSdkPath
=
{
def
properties
=
new
Properties
()
file
(
"local.properties"
).
withInputStream
{
properties
.
load
(
it
)
}
def
flutterSdkPath
=
properties
.
getProperty
(
"flutter.sdk"
)
assert
flutterSdkPath
!=
null
,
"flutter.sdk not set in local.properties"
return
flutterSdkPath
}()
def
localPropertiesFile
=
new
File
(
rootProject
.
projectDir
,
"local.properties"
)
includeBuild
(
"$flutterSdkPath/packages/flutter_tools/gradle"
)
def
properties
=
new
Properties
()
assert
localPropertiesFile
.
exists
()
repositories
{
localPropertiesFile
.
withReader
(
"UTF-8"
)
{
reader
->
properties
.
load
(
reader
)
}
google
()
mavenCentral
()
gradlePluginPortal
()
}
}
def
flutterSdkPath
=
properties
.
getProperty
(
"flutter.sdk"
)
plugins
{
assert
flutterSdkPath
!=
null
,
"flutter.sdk not set in local.properties"
id
"dev.flutter.flutter-plugin-loader"
version
"1.0.0"
apply
from:
"$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
id
"com.android.application"
version
"7.2.2"
apply
false
id
"org.jetbrains.kotlin.android"
version
"1.8.20"
apply
false
}
include
":app"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment