Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
DennisAlund committed Jan 5, 2025
2 parents 8114c2b + ce7b6ad commit 8545f74
Show file tree
Hide file tree
Showing 19 changed files with 175 additions and 510 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 0.19.5
- Bump up android gradle version to `8.11.1`
- Update gradle syntax to use declarative style
- Update Facebook app events unit tests from using deprecated setMockMethodCallHandler method
- Enhance widget tests to verify example app rendering and button text content

## 0.19.4
- Updating `FBAudienceNetwork`to version `6.16`
- Updating iOS properties
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,15 @@ You must first create an app at Facebook for developers: https://developers.face

### Configure Android

Read through the "[Getting Started with App Events for Android](https://developers.facebook.com/docs/app-events/getting-started-app-events-android)" tutorial and in particular, follow [step 3](https://developers.facebook.com/docs/app-events/getting-started-app-events-android#step-3--integrate-the-facebook-sdk-in-your-android-app) by adding the following into `android/app/src/main/res/values/strings.xml` (or into respective `debug` or `release` build flavor)
Read through the "[Get Started with App Events (Android)](https://developers.facebook.com/docs/app-events/getting-started-app-events-android)" and "[Getting Started with the Facebook SDK for Android](https://developers.facebook.com/docs/android/getting-started)" tutorial. In particular, follow [Update Your Manifest](https://developers.facebook.com/docs/android/getting-started#add-app_id) step by adding the following into `android/app/src/main/res/values/strings.xml` (or into respective `debug` or `release` build flavor)

```xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="facebook_app_id">[APP_ID]</string>
<string name="facebook_client_token">[CLIENT_TOKEN]</string>
<string name="fb_login_protocol_scheme">fb[APP_ID]</string>
<string name="app_name">[APP_NAME]</string>
</resources>
```

Expand Down
73 changes: 34 additions & 39 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,71 +1,66 @@
group 'id.oddbit.flutter.facebook_app_events'
version '1.0-SNAPSHOT'
group = "id.oddbit.flutter.facebook_app_events"
version = "1.0-SNAPSHOT"

buildscript {
ext.kotlin_version = '1.8.22'
ext.kotlin_version = "1.8.22"
repositories {
google()
mavenCentral()
}

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

rootProject.allprojects {
allprojects {
repositories {
google()
mavenCentral()
}
}

apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: "com.android.library"
apply plugin: "kotlin-android"

android {

// Conditional for compatibility with AGP < 4.2
if (project.android.hasProperty("namespace")) {
namespace "id.oddbit.flutter.facebook_app_events"
}

compileSdkVersion 33

sourceSets {
main.java.srcDirs += 'src/main/kotlin'
}
defaultConfig {
minSdkVersion 16
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
lintOptions {
disable 'InvalidPackage'
}
compileSdk = 34

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}

kotlinOptions {
jvmTarget = "1.8"
jvmTarget = JavaVersion.VERSION_1_8
}

}
sourceSets {
main.java.srcDirs += "src/main/kotlin"
test.java.srcDirs += "src/test/kotlin"
}

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
// # READ THIS
// When updating the Facebook SDK. Please note these guidelines to avoid
// conflicts with other plugins that also rely on the FBSDK.
//
// - Only specify the major version of the SDK.
// - Do **not** specify the `minor` or `patch` version.
//
// About the version syntax:
// - https://github.com/oddbit/flutter_facebook_app_events/pull/189#discussion_r768267841
// - https://docs.oracle.com/middleware/1212/core/MAVEN/maven_version.htm#MAVEN402
implementation 'com.facebook.android:facebook-android-sdk:[17.0,18.0)'
}
defaultConfig {
minSdk = 21
}

dependencies {
// # READ THIS
// When updating the Facebook SDK. Please note these guidelines to avoid
// conflicts with other plugins that also rely on the FBSDK.
//
// - Only specify the major version of the SDK.
// - Do **not** specify the `minor` or `patch` version.
//
// About the version syntax:
// - https://github.com/oddbit/flutter_facebook_app_events/pull/189#discussion_r768267841
// - https://docs.oracle.com/middleware/1212/core/MAVEN/maven_version.htm#MAVEN402
implementation("com.facebook.android:facebook-android-sdk:[17.0,18.0)")
}
}
5 changes: 0 additions & 5 deletions android/gradle.properties

This file was deleted.

Binary file removed android/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 0 additions & 5 deletions android/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

234 changes: 0 additions & 234 deletions android/gradlew

This file was deleted.

Loading

0 comments on commit 8545f74

Please sign in to comment.