Skip to content

Commit 5eb2074

Browse files
robertson-wawerurobertson-waweru
authored
Update homescreen, bump the agentforcesdk version, and file clean up (#13)
1 parent 2bccdee commit 5eb2074

File tree

66 files changed

+136
-19095
lines changed

Some content is hidden

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

66 files changed

+136
-19095
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ DerivedData
2020
*.ipa
2121
*.xcuserstate
2222
project.xcworkspace
23-
**/.xcode.env.local
23+
**/.xcode.env
2424

2525
# Gradle
2626
/packages/rn-tester/build

‎AgentforceSDK-ReactNative-Bridge/android/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlinx-serialization'
55

66
android {
77
namespace = "com.salesforce.android.reactagentforce"
8-
compileSdk 35
8+
compileSdk 36
99

1010
defaultConfig {
1111
minSdkVersion 29
12-
targetSdkVersion 35
12+
targetSdkVersion 36
1313
versionCode 1
1414
versionName "1.0"
1515
}
@@ -41,14 +41,15 @@ repositories {
4141
google()
4242
mavenCentral()
4343
maven { url 'https://jitpack.io' }
44-
maven { url 'https://opensource.salesforce.com/AgentforceMobileSDK-Android/agentforce-sdk-repository-experimental' }
44+
maven { url 'https://opensource.salesforce.com/AgentforceMobileSDK-Android/agentforce-sdk-repository' }
45+
maven { url 'https://s3.amazonaws.com/inapp.salesforce.com/public/android' }
4546
maven { url 'https://s3.amazonaws.com/salesforce-async-messaging-experimental/public/android' }
4647
}
4748

4849
dependencies {
4950
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.5"
5051
implementation "com.facebook.react:react-android"
51-
api "com.salesforce.android.agentforcesdk:agentforce-sdk:14.20.0-experimental"
52+
api "com.salesforce.android.agentforcesdk:agentforce-sdk:14.97.1"
5253
// compileOnly: host app adds this for Employee Agent. Bridge compiles; host provides at runtime.
5354
compileOnly "com.salesforce.mobilesdk:SalesforceReact:13.1.1"
5455

@@ -61,7 +62,7 @@ dependencies {
6162
implementation 'androidx.activity:activity-compose:1.8.2'
6263
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.7.0'
6364

64-
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.0.20"
65+
implementation "org.jetbrains.kotlin:kotlin-stdlib:2.2.0"
6566
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3"
6667
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.7.0"
6768
}

‎AgentforceSDK-ReactNative-Bridge/ios/ReactNativeAgentforce.podspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Pod::Spec.new do |s|
1616
s.version = package["version"]
1717
s.summary = "Agentforce React Native bridge"
1818
s.description = package["description"]
19-
s.homepage = "https://git.soma.salesforce.com/robertson-waweru/AgentforceSDK-ReactNative-Bridge"
19+
s.homepage = "https://github.com/salesforce/AgentforceMobileSDK-ReactNative"
2020
s.license = "BSD-3-Clause"
2121
s.author = "Salesforce"
22-
s.source = { :git => "https://git.soma.salesforce.com/robertson-waweru/AgentforceSDK-ReactNative-Bridge.git", :tag => "v#{s.version}" }
22+
s.source = { :git => "https://github.com/salesforce/AgentforceMobileSDK-ReactNative.git", :tag => "v#{s.version}" }
2323
s.requires_arc = true
2424
s.platforms = { :ios => "15.0" }
2525
s.swift_version = "5.0"

‎android/app/build.gradle‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ def enableProguardInReleaseBuilds = false
7171
def jscFlavor = 'org.webkit:android-jsc:+'
7272

7373
android {
74-
namespace = "com.salesforce.android.reactagentforce"
74+
// Use a distinct namespace from the bridge library to avoid duplicate BuildConfig (both would otherwise be com.salesforce.android.reactagentforce.BuildConfig).
75+
namespace = "com.salesforce.android.reactagentforce.app"
7576
compileSdk rootProject.ext.compileSdk
7677

7778
defaultConfig {
@@ -103,6 +104,12 @@ android {
103104
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
104105
}
105106
}
107+
108+
packaging {
109+
resources {
110+
excludes += 'META-INF/versions/9/OSGI-INF/MANIFEST.MF'
111+
}
112+
}
106113
}
107114

108115
dependencies {

‎android/app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
android:name="com.salesforce.android.agentforcesdkimpl.utils.AgentforcePDFFileProvider"
4545
android:authorities="${applicationId}.pdffileprovider"
4646
android:exported="false"
47-
android:grantUriPermissions="true">
47+
android:grantUriPermissions="true"
48+
tools:replace="android:authorities">
4849
<meta-data
4950
android:name="android.support.FILE_PROVIDER_PATHS"
5051
android:resource="@xml/pdf_file_paths" />

android/app/src/main/java/com/salesforce/android/reactagentforce/MainActivity.java renamed to android/app/src/main/java/com/salesforce/android/reactagentforce/app/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
Copyright (c) 2024-present, salesforce.com, inc. All rights reserved.
3-
3+
44
Redistribution and use of this software in source and binary forms, with or without modification,
55
are permitted provided that the following conditions are met:
66
* Redistributions of source code must retain the above copyright notice, this list of conditions
@@ -11,7 +11,7 @@
1111
* Neither the name of salesforce.com, inc. nor the names of its contributors may be used to
1212
endorse or promote products derived from this software without specific prior written
1313
permission of salesforce.com, inc.
14-
14+
1515
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
1616
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
1717
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
@@ -21,7 +21,7 @@
2121
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
2222
WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2323
*/
24-
package com.salesforce.android.reactagentforce;
24+
package com.salesforce.android.reactagentforce.app;
2525

2626
import android.os.Bundle;
2727
import com.facebook.react.ReactActivity;

android/app/src/main/java/com/salesforce/android/reactagentforce/MainApplication.java renamed to android/app/src/main/java/com/salesforce/android/reactagentforce/app/MainApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2525
* POSSIBILITY OF SUCH DAMAGE.
2626
*/
27-
package com.salesforce.android.reactagentforce;
27+
package com.salesforce.android.reactagentforce.app;
2828

2929
import android.app.Application;
3030

@@ -47,7 +47,7 @@ public class MainApplication extends Application implements ReactApplication {
4747
private final ReactNativeHost mReactNativeHost = new DefaultReactNativeHost(this) {
4848
@Override
4949
public boolean getUseDeveloperSupport() {
50-
return com.salesforce.android.reactagentforce.BuildConfig.DEBUG;
50+
return BuildConfig.DEBUG;
5151
}
5252

5353
@Override

‎android/app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<string name="account_type">com.salesforce.android.reactagentforce.login</string>
44
<string name="app_name">ReactAgentforce</string>
55
<string name="app_package">com.salesforce.android.reactagentforce</string>
6+
<!-- Override AgentforceSDK 14.97.1 string that uses multiple % without positional format -->
7+
<string name="af__audio_duration_format" formatted="false">%1$d:%2$02d</string>
68
</resources>

‎android/build.gradle‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
buildscript {
22
ext {
3-
compileSdk = 35
3+
compileSdk = 36
44
minSdkVersion = 29
5-
targetSdkVersion = 35
6-
kotlin_version = '2.0.20'
5+
targetSdkVersion = 36
6+
kotlin_version = '2.2.0'
77
// We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
88
ndkVersion = "23.1.7779620"
99
}
@@ -25,7 +25,7 @@ buildscript {
2525
}
2626

2727
dependencies {
28-
classpath 'com.android.tools.build:gradle:8.6.1'
28+
classpath 'com.android.tools.build:gradle:8.9.1'
2929
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
3030
classpath "org.jetbrains.kotlin:compose-compiler-gradle-plugin:$kotlin_version"
3131
classpath "com.facebook.react:react-native-gradle-plugin"
@@ -39,7 +39,8 @@ allprojects {
3939
mavenCentral()
4040
// Required for AgentforceSDK
4141
maven { url('https://jitpack.io') }
42-
maven { url('https://opensource.salesforce.com/AgentforceMobileSDK-Android/agentforce-sdk-repository-experimental')}
42+
maven { url('https://opensource.salesforce.com/AgentforceMobileSDK-Android/agentforce-sdk-repository') }
43+
maven { url("https://s3.amazonaws.com/inapp.salesforce.com/public/android") }
4344
maven { url('https://s3.amazonaws.com/salesforce-async-messaging-experimental/public/android') }
4445
}
4546
}

‎android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)