Skip to content

Commit fe3954e

Browse files
ahmedAlaaInstabugmzelzoghbikholood-eaandrewdanieldevAyaMahmoud148
authored
Sanity/v16.0.0 (#621)
* fix: add support for newer gradle versions (#512) * feat: attach w3c header (#481) * feat: add android feature flag * fix: test cases * fix: test cases * fix: test cases * fix: test cases * fix: add more test cases * fix: add more test cases * fix: add more test cases * fix: add more test cases * Release: v14.0.0 (#532) * chore(android): bump sdk to v14.0.0 * chore(ios): bump sdk to v14.0.0 * Release: v14.0.0 * Release: v14.0.0 * Release: v14.0.0 * chore: change release date (#535) * Release: v14.0.0 (#533) * fix: add support for newer gradle versions (#512) * feat: attach w3c header (#481) * feat: add android feature flag * fix: test cases * fix: test cases * fix: test cases * fix: test cases * fix: add more test cases * fix: add more test cases * fix: add more test cases * fix: add more test cases * Release: v14.0.0 (#532) * chore(android): bump sdk to v14.0.0 * chore(ios): bump sdk to v14.0.0 * Release: v14.0.0 * Release: v14.0.0 * Release: v14.0.0 * chore: change release date (#535) --------- Co-authored-by: kholood <keassa@instabug.com> * Release: 14.1.0 (#539) * release: 14.1.0 * release: 14.1.0 * release: v14.1.0 * release: v14.1.0 * Release: v14.1.0 (#542) * fix: add support for newer gradle versions (#512) * feat: attach w3c header (#481) * feat: add android feature flag * fix: test cases * fix: test cases * fix: test cases * fix: test cases * fix: add more test cases * fix: add more test cases * fix: add more test cases * fix: add more test cases * Release: v14.0.0 (#532) * chore(android): bump sdk to v14.0.0 * chore(ios): bump sdk to v14.0.0 * Release: v14.0.0 * Release: v14.0.0 * Release: v14.0.0 * chore: change release date (#535) * Release: 14.1.0 (#539) * release: 14.1.0 * release: 14.1.0 * release: v14.1.0 * release: v14.1.0 --------- Co-authored-by: kholood <keassa@instabug.com> * fix: set ReproStepsConfig on android * release: v14.1.0 * fix: set ReproStepsConfig * fix(android): report current view change * chore(android): update report current view test * chore(android): add report current view to mocked class * chore: Enhance inline code documentation * fix(android): fix test case * chore: Enhance inline code documentation * chore: increase the test coverage of APM related classes. * chore: apply dart format * chore: apply lint comments * chore: Integrate the absent APM APIs into the APM screen of the sample application. * chore: apply dart format * fix: e2e test * feat: support 3.29 * feat: enable/disable stop capturing network body * fix: add change log * Update CHANGELOG.md * feat: support 3.29 * feat: support 3.29 * feat: support 3.29 * feat: support 3.29 * ci: fix ci issue * chore: flutter sanity branch * fix: revert pod version * fix: use released versions * fix: changelog * fix: change log formate * fix: native fatal crash * chore: bump android version to 14.3.0 * Update CHANGELOG.md * Rlease: 14.3.0 * refactor: Replace APM API that uses reflection by a package private API * fix: network log unit test * feat: support BR adding user consents (#573) * feat: support BR adding user consents * feat: add change log * fix: android test * fix: use named parameters * fix: ios tests * Release: v14.3.1 (#577) * release: v14.3.1 * feat: support xcode 16 (#574) * feat: xcode 16 support * feat: xcode 16 support * feat: xcode 16 support * feat: xcode 16 support * feat: xcode 16 support * chore: update changelog --------- Co-authored-by: kholood <keassa@instabug.com> * Revert "refactor: Replace APM API that uses reflection by a package private API" (#580) * Release/v15.0.1 (#581) * Revert "refactor: Replace APM API that uses reflection by a package private API" This reverts commit 55fba6d. * chore(ios): bump sdk to v.15.1.1 * chore(android): bump SDK to v15.0.1 * chore: bump sdk to v15.0.1 * chore:add change log item * Release: v14.3.1 (#577) (#588) * release: v14.3.1 Co-authored-by: Mohamed Zakaria El-Zoghbi <5540492+mzelzoghbi@users.noreply.github.com> Co-authored-by: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> * Release: v14.3.1 (#577) (#589) * release: v14.3.1 Co-authored-by: Mohamed Zakaria El-Zoghbi <5540492+mzelzoghbi@users.noreply.github.com> Co-authored-by: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> Co-authored-by: Ahmed alaa <aalaa@instabug.com> * Release: v14.3.1 (#577) (#591) * release: v14.3.1 Co-authored-by: Mohamed Zakaria El-Zoghbi <5540492+mzelzoghbi@users.noreply.github.com> * bump: android SDK to 15.0.2 (#594) * bump: android SDK to 15.0.2 * bump: android SDK to 15.0.2 * Merge pull request #597 from Instabug/release/androidv15.0.2 Release: v15.0.2 * feat: support app variant (#585) * feat: app variant * feat: app variant * feat: app variant * feat: app variant * feat: support advanced UI customization (#599) * feat: support advanced UI customization * chore: add change log * fix: delete setFullScreen * fix: linting * fix: unit test * fix: linting * fix: resolve comments * fix: add full screen function * fix: ios tests * fix: ios tests * chore: remove deprecated apis (#614) * feat: support advanced UI customization * chore: add change log * fix: delete setFullScreen * fix: linting * fix: unit test * fix: linting * fix: resolve comments * chore: remove deprecated apis * chore: add changelog * fix: setTheme calling * fix: formatte * fix: formate * fix: formatting * fix: ios tests * fix: ios tests * fix: e2e tests * fix: formate analyze * fix: e2e ios testing * fix: format --------- Co-authored-by: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> --------- Co-authored-by: ahmed alaa <154802748+ahmedAlaaInstabug@users.noreply.github.com> * bump native SDKs to 16.0.0 * bump native SDKs to 16.0.0 * fix: merge issues * fix: merge issues * fix: analyze * fix: analyze * fix: analyze --------- Co-authored-by: Mohamed Zakaria El-Zoghbi <5540492+mzelzoghbi@users.noreply.github.com> Co-authored-by: kholood <keassa@instabug.com> Co-authored-by: Andrew Amin <adaniel@instabug.com> Co-authored-by: Andrew Amin <160974398+AndrewAminInstabug@users.noreply.github.com> Co-authored-by: AyaMahmoud148 <ayaabdelbaseet@instabug.com>
1 parent 96b1744 commit fe3954e

Some content is hidden

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

54 files changed

+342
-333
lines changed
Lines changed: 28 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,56 @@
1-
def localProperties = new Properties()
2-
def localPropertiesFile = rootProject.file('local.properties')
3-
if (localPropertiesFile.exists()) {
4-
localPropertiesFile.withReader('UTF-8') { reader ->
5-
localProperties.load(reader)
6-
}
7-
}
8-
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-
14-
def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
15-
if (flutterVersionCode == null) {
16-
flutterVersionCode = '1'
17-
}
18-
19-
def flutterVersionName = localProperties.getProperty('flutter.versionName')
20-
if (flutterVersionName == null) {
21-
flutterVersionName = '1.0'
1+
plugins {
2+
id "com.android.application"
3+
id "kotlin-android"
4+
// The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
5+
id "dev.flutter.flutter-gradle-plugin"
226
}
237

24-
apply plugin: 'com.android.application'
25-
apply plugin: 'kotlin-android'
26-
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
27-
288
android {
29-
compileSdkVersion flutter.compileSdkVersion
9+
namespace = "com.example.example"
10+
compileSdk = flutter.compileSdkVersion
11+
ndkVersion = flutter.ndkVersion
3012

3113
compileOptions {
32-
sourceCompatibility JavaVersion.VERSION_1_8
33-
targetCompatibility JavaVersion.VERSION_1_8
14+
sourceCompatibility = JavaVersion.VERSION_1_8
15+
targetCompatibility = JavaVersion.VERSION_1_8
3416
}
3517

3618
kotlinOptions {
37-
jvmTarget = '1.8'
38-
}
39-
40-
sourceSets {
41-
main.java.srcDirs += 'src/main/kotlin'
19+
jvmTarget = JavaVersion.VERSION_1_8
4220
}
4321

4422
defaultConfig {
45-
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
4623
applicationId "com.example.example"
47-
minSdkVersion flutter.minSdkVersion
48-
targetSdkVersion flutter.targetSdkVersion
49-
versionCode flutterVersionCode.toInteger()
50-
versionName flutterVersionName
24+
minSdkVersion 21
25+
targetSdkVersion 34
26+
versionCode flutter.versionCode
27+
versionName flutter.versionName
28+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
29+
multiDexEnabled true
5130
}
5231

5332
buildTypes {
5433
release {
5534
// TODO: Add your own signing config for the release build.
5635
// Signing with the debug keys for now, so `flutter run --release` works.
57-
signingConfig signingConfigs.debug
36+
signingConfig = signingConfigs.debug
5837
}
5938
}
39+
namespace = "com.example.example"
40+
41+
configurations.all {
42+
resolutionStrategy.force 'org.hamcrest:hamcrest-core:1.3'
43+
}
6044
}
6145

6246
flutter {
6347
source '../..'
6448
}
6549

6650
dependencies {
67-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
51+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20"
52+
implementation 'com.android.support:multidex:1.0.3'
53+
implementation 'org.mockito:mockito-core:1.10.19'
54+
testImplementation 'junit:junit:4.12'
55+
testImplementation 'org.mockito:mockito-core:1.10.19'
6856
}

packages/instabug_dio_interceptor/example/android/app/src/debug/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
2+
>
33

44
<application
55
android:name="${applicationName}"

packages/instabug_dio_interceptor/example/android/app/src/profile/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.example.example">
1+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
32
<!-- Flutter needs it to communicate with the running application
43
to allow setting breakpoints, to provide hot reload, etc.
54
-->
Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,15 @@
1-
buildscript {
2-
ext.kotlin_version = '1.6.10'
3-
repositories {
4-
google()
5-
mavenCentral()
6-
}
7-
8-
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.0'
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
14-
allprojects {
15-
repositories {
16-
google()
17-
mavenCentral()
18-
}
19-
}
20-
211
rootProject.buildDir = '../build'
2+
3+
//android {
4+
// namespace 'com.instabug.flutter.example'
5+
//}
226
subprojects {
237
project.buildDir = "${rootProject.buildDir}/${project.name}"
248
}
259
subprojects {
2610
project.evaluationDependsOn(':app')
2711
}
2812

29-
task clean(type: Delete) {
13+
tasks.register("clean", Delete) {
3014
delete rootProject.buildDir
3115
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
org.gradle.jvmargs=-Xmx1536M
22
android.useAndroidX=true
33
android.enableJetifier=true
4+
android.defaults.buildfeatures.buildconfig=true
5+
android.nonTransitiveRClass=false
6+
android.nonFinalResIds=false

packages/instabug_dio_interceptor/example/android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,27 @@
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+
maven { url 'https://storage.googleapis.com/flutter-plugins' }
817

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"
18+
}
19+
}
20+
21+
plugins {
22+
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
23+
id "com.android.application" version "8.1.0" apply false
24+
id "org.jetbrains.kotlin.android" version "1.8.22" apply false
25+
}
26+
27+
include ":app"

packages/instabug_dio_interceptor/example/ios/Flutter/AppFrameworkInfo.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

packages/instabug_dio_interceptor/example/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
platform :ios, '11.0'
2+
platform :ios, '14.4'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

0 commit comments

Comments
 (0)