Skip to content

Commit 4e44bc9

Browse files
gspencergooggspencergoog
authored
Merge pull request #6 from flutter/master
Pulling from flutter/flutter
2 parents 1afb2d7 + be228ea commit 4e44bc9

File tree

142 files changed

+2673
-588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+2673
-588
lines changed

‎bin/internal/dart-sdk.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.24.0
1+
1.24.2

‎bin/internal/engine.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8a2d337446ca076048608c6b6a932110e7c0f9c9
1+
009d470d509a71cd933e10269fa6820000d9488f

‎dev/benchmarks/complex_layout/android/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
/captures
99
GeneratedPluginRegistrant.java
1010

11-
/gradle
11+
gradle-wrapper.jar
1212
/gradlew
1313
/gradlew.bat

‎dev/benchmarks/complex_layout/android/app/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ android {
2323
}
2424

2525
defaultConfig {
26+
minSdkVersion 16
27+
targetSdkVersion 25
28+
versionCode 1
29+
versionName "0.0.1"
2630
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2731
}
2832

‎dev/benchmarks/complex_layout/android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.yourcompany.complexLayout"
3-
android:versionCode="1"
4-
android:versionName="0.0.1">
2+
package="com.yourcompany.complexLayout">
53

6-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
74
<uses-permission android:name="android.permission.INTERNET"/>
85

96
<application android:name="io.flutter.app.FlutterApplication" android:label="complex_layout" android:icon="@mipmap/ic_launcher">

‎dev/benchmarks/complex_layout/android/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
buildscript {
22
repositories {
33
jcenter()
4+
maven {
5+
url "https://maven.google.com"
6+
}
47
}
58

69
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.2.3'
10+
classpath 'com.android.tools.build:gradle:2.3.3'
811
}
912
}
1013

@@ -20,12 +23,9 @@ allprojects {
2023
rootProject.buildDir = '../build'
2124
subprojects {
2225
project.buildDir = "${rootProject.buildDir}/${project.name}"
26+
project.evaluationDependsOn(':app')
2327
}
2428

2529
task clean(type: Delete) {
2630
delete rootProject.buildDir
2731
}
28-
29-
task wrapper(type: Wrapper) {
30-
gradleVersion = '2.14.1'
31-
}

‎dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#Fri Jun 23 08:50:38 CEST 2017
2+
distributionBase=GRADLE_USER_HOME
3+
distributionPath=wrapper/dists
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

‎dev/benchmarks/microbenchmarks/android/.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
/captures
99
GeneratedPluginRegistrant.java
1010

11-
/gradle
11+
gradle-wrapper.jar
1212
/gradlew
1313
/gradlew.bat

‎dev/benchmarks/microbenchmarks/android/app/build.gradle‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ android {
2323
}
2424

2525
defaultConfig {
26+
minSdkVersion 16
27+
targetSdkVersion 25
28+
versionCode 1
29+
versionName "0.0.1"
2630
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2731
}
2832

‎dev/benchmarks/microbenchmarks/android/app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.yourcompany.microbenchmarks"
3-
android:versionCode="1"
4-
android:versionName="0.0.1">
2+
package="com.yourcompany.microbenchmarks">
53

6-
<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
74
<uses-permission android:name="android.permission.INTERNET"/>
85

96
<application android:name="io.flutter.app.FlutterApplication" android:label="microbenchmarks" android:icon="@mipmap/ic_launcher">

0 commit comments

Comments
 (0)