Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release sync #57

Merged
merged 45 commits into from
Apr 9, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
a6a2a6a
Add e2e testing workflow
shounak-mulay Aug 26, 2023
a35c7ca
Use qa env file in e2e workflow
shounak-mulay Aug 26, 2023
2f9cf45
Merge branch 'main' into e2e-workflow
shounak-mulay Aug 26, 2023
683c2f8
Merge pull request #46 from wednesday-solutions/e2e-workflow
shounak-mulay Aug 26, 2023
e64c0fb
Update e2e.yml
shounak-mulay Aug 26, 2023
373e076
Add verbose patrol logs
shounak-mulay Aug 26, 2023
d1b1716
Add verbose patrol logs
shounak-mulay Aug 26, 2023
85fd137
Generate config before test apk
shounak-mulay Aug 26, 2023
599e27f
test rules
shounak-mulay Aug 27, 2023
17ce5b3
revert policy check
shounak-mulay Aug 27, 2023
e7ca08e
Merge pull request #48 from wednesday-solutions/e2e-workflow-test
shounak-mulay Aug 27, 2023
fe19b71
Wait for home to update in favourite test
shounak-mulay Aug 29, 2023
ada3102
Merge branch 'main' of github.com-wednesday:wednesday-solutions/flutt…
shounak-mulay Aug 29, 2023
3fead7f
fix: workflow fix for fork PRs
anasnadeemws Mar 15, 2024
915e420
Merge pull request #49 from anasnadeemws/fix/fork-workflow-issue
alichherawalla Mar 20, 2024
1c09e76
Upgrade packages. Update android gradle files to match new gradle syntax
shounak-mulay Apr 8, 2024
57a1bcc
Update target and compile sdk version to 34
shounak-mulay Apr 8, 2024
a16aabc
Add script for e2e
shounak-mulay Apr 8, 2024
3f5c3cd
Update workflows
shounak-mulay Apr 8, 2024
5ca1525
Convert result class to dart sealed class
shounak-mulay Apr 8, 2024
dd4bb24
Make result class equatable
shounak-mulay Apr 8, 2024
c80f63e
Merge branch 'main' into lib_version_upgrades
shounak-mulay Apr 8, 2024
4edf3c6
Add cache key to flutter action
shounak-mulay Apr 8, 2024
504f398
Change cache key for flutter action to force refresh
shounak-mulay Apr 8, 2024
a312799
Change pub cache key for flutter action to force refresh
shounak-mulay Apr 8, 2024
280b12a
Update README.md
shounak-mulay Apr 8, 2024
23e6089
Merge pull request #52 from wednesday-solutions/readme-patrol-update
shounak-mulay Apr 8, 2024
e65ba6e
Merge branch 'main' into lib_version_upgrades
shounak-mulay Apr 8, 2024
4d4d6a6
Change pub cache key for flutter action to force refresh
shounak-mulay Apr 8, 2024
3d34264
Merge pull request #53 from wednesday-solutions/cache-key-update
shounak-mulay Apr 9, 2024
8b2ea87
Change pub cache key for flutter action to force refresh
shounak-mulay Apr 9, 2024
fc08270
Merge pull request #54 from wednesday-solutions/cache-key-update
shounak-mulay Apr 9, 2024
a2102cb
Merge branch 'main' into lib_version_upgrades
shounak-mulay Apr 9, 2024
381ff89
Change pub cache key for flutter action to force refresh
shounak-mulay Apr 9, 2024
a676207
Merge pull request #55 from wednesday-solutions/cache-key-update
shounak-mulay Apr 9, 2024
df7e0ef
Merge branch 'main' into lib_version_upgrades
shounak-mulay Apr 9, 2024
e7c1780
Update ci.yml
shounak-mulay Apr 9, 2024
767f171
Update e2e.yml
shounak-mulay Apr 9, 2024
d252b16
Merge pull request #56 from wednesday-solutions/shounak-mulay-patch-1
shounak-mulay Apr 9, 2024
d08db9d
Merge branch 'main' into lib_version_upgrades
shounak-mulay Apr 9, 2024
ad02e58
Use super values in constructors
shounak-mulay Apr 9, 2024
a2acdbf
Merge branch 'lib_version_upgrades' of github.com-wednesday:wednesday…
shounak-mulay Apr 9, 2024
eb4459f
Setup java 17 in android jobs
shounak-mulay Apr 9, 2024
2de0433
Update goldens
shounak-mulay Apr 9, 2024
3d08aad
Merge pull request #51 from wednesday-solutions/lib_version_upgrades
shounak-mulay Apr 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Upgrade packages. Update android gradle files to match new gradle syntax
  • Loading branch information
shounak-mulay committed Apr 8, 2024
commit 1c09e76bc9e15cdd3387dbd7839d989d2c045740
17 changes: 8 additions & 9 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
plugins {
id "com.android.application"
id "kotlin-android"
id "dev.flutter.flutter-gradle-plugin"
}

def localProperties = new Properties()
def localPropertiesFile = rootProject.file('local.properties')
if (localPropertiesFile.exists()) {
Expand All @@ -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')
if (flutterVersionCode == null) {
flutterVersionCode = '1'
Expand All @@ -21,11 +22,9 @@ if (flutterVersionName == null) {
flutterVersionName = '1.0'
}

apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

android {
namespace "com.wednesday.flutter_template"
compileSdkVersion project.properties['flutter.compileSdkVersion'].toInteger()

compileOptions {
Expand Down Expand Up @@ -111,7 +110,7 @@ flutter {
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.23"

implementation 'androidx.core:core-splashscreen:1.0.0-beta01'

Expand Down
3 changes: 2 additions & 1 deletion android/app/src/androidTest/java/MainActivityTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import androidx.test.platform.app.InstrumentationRegistry;

import com.example.flutter_template.MainActivity;
import com.wednesday.flutter_template
.MainActivity;

import org.junit.Test;
import org.junit.runner.RunWith;
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/debug/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.flutter_template">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.flutter_template">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET"/>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package com.example.flutter_template
package com.wednesday.flutter_template


import android.os.Bundle
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
Expand Down
3 changes: 1 addition & 2 deletions android/app/src/profile/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.flutter_template">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Flutter needs it to communicate with the running application
to allow setting breakpoints, to provide hot reload, etc.
-->
Expand Down
13 changes: 0 additions & 13 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
buildscript {
ext.kotlin_version = '1.6.10'
repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}

allprojects {
repositories {
google()
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
30 changes: 22 additions & 8 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,25 @@
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")
def properties = new Properties()
includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")

assert localPropertiesFile.exists()
localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}

def flutterSdkPath = properties.getProperty("flutter.sdk")
assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
plugins {
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
id "com.android.application" version "8.3.0" apply false
id "org.jetbrains.kotlin.android" version "1.9.23" apply false
}

include ":app"
2 changes: 0 additions & 2 deletions integration_test/favorites_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import 'test_actions.dart';
void main() {
patrolTest(
'user can search cities and add or remove them from favorites',
// ignore: deprecated_member_use
nativeAutomation: true,
(patrol) async {
await setupApp(patrol);

Expand Down
2 changes: 0 additions & 2 deletions integration_test/language_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import 'test_actions.dart';
void main() {
patrolTest(
"users are able to change the language of the app",
// ignore: deprecated_member_use
nativeAutomation: true,
(patrol) async {
await setupApp(patrol);

Expand Down
12 changes: 8 additions & 4 deletions integration_test/test_bundle.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading