Skip to content

Commit 7b06db6

Browse files
authored
Merge pull request #174 from clariusdev/examples/v12.0.0
updating examples for v12.0.0
2 parents 36e1e9c + 7d6838a commit 7b06db6

File tree

32 files changed

+779
-862
lines changed

32 files changed

+779
-862
lines changed

examples/cast_android/app/build.gradle

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ plugins {
33
}
44

55
android {
6-
compileSdk 33
6+
compileSdk 34
77
defaultConfig {
8-
applicationId "me.clarius.sdk.cast.example"
8+
applicationId 'me.clarius.sdk.cast.example'
99
minSdk 26
10-
targetSdk 32
10+
targetSdk 34
1111
versionCode 1
12-
versionName "1.0"
12+
versionName '1.0'
1313

14-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
14+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1515
}
1616
buildTypes {
1717
release {
@@ -39,9 +39,9 @@ dependencies {
3939
implementation fileTree(dir: '../../../libs', include: 'cast-debug.aar')
4040
implementation fileTree(dir: 'libs', include: 'cast-debug.aar')
4141

42-
implementation 'androidx.appcompat:appcompat:1.6.1'
43-
implementation 'com.google.android.material:material:1.8.0'
42+
implementation 'androidx.appcompat:appcompat:1.7.0'
43+
implementation 'com.google.android.material:material:1.12.0'
4444
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
45-
implementation 'androidx.navigation:navigation-fragment:2.5.3'
46-
implementation 'androidx.navigation:navigation-ui:2.5.3'
45+
implementation 'androidx.navigation:navigation-fragment:2.8.2'
46+
implementation 'androidx.navigation:navigation-ui:2.8.2'
4747
}

examples/cast_android/app/proguard-rules.pro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# proguardFiles setting in build.gradle.
44
#
55
# For more details, see
6-
# http://developer.android.com/guide/developing/tools/proguard.html
6+
# https://developer.android.com/guide/developing/tools/proguard.html
77

88
# If your project uses WebView with JS, uncomment the following
99
# and specify the fully qualified class name to the JavaScript interface

examples/cast_android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
android:label="@string/app_name"
1414
android:roundIcon="@mipmap/ic_launcher_round"
1515
android:supportsRtl="true"
16+
android:usesCleartextTraffic="false"
1617
android:theme="@style/Theme.CastExample"
1718
tools:targetApi="31">
1819
<activity

examples/cast_android/app/src/main/java/me/clarius/sdk/cast/example/CastService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void newSpectralImageFn(ByteBuffer data, SpectralImageInfo info) {
7070
}
7171

7272
@Override
73-
public void newImuDataFn(PosInfo[] pos) {
73+
public void newImuDataFn(PosInfo pos) {
7474
}
7575

7676
@Override

examples/cast_android/app/src/main/java/me/clarius/sdk/cast/example/FirstFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,11 @@ private void doConnect() {
161161
}
162162
Optional<Long> networkId = Utils.maybeLong(binding.networkId.getText());
163163
showMessage("Connecting to " + ipAddress + ":" + tcpPort.get());
164-
castBinder.getCast().connect(ipAddress, tcpPort.get(), networkId, getCertificate(), (result, port, swRevMatch) -> {
164+
castBinder.getCast().connect(ipAddress, tcpPort.get(), networkId, getCertificate(), (result, imagePort, imuPort, swRevMatch) -> {
165165
Log.d(TAG, "Connection result: " + result);
166166
if (result) {
167-
Log.d(TAG, "UDP stream will be on port " + port);
167+
Log.d(TAG, "UDP stream will be on port " + imagePort);
168+
Log.d(TAG, "IMU stream will be on port " + imuPort);
168169
Log.d(TAG, "App software " + (swRevMatch ? "matches" : "does not match"));
169170
askProbeInfo(castBinder.getCast());
170171
}

examples/cast_android/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
plugins {
3-
id 'com.android.application' version '7.4.0' apply false
4-
id 'com.android.library' version '7.4.0' apply false
3+
id 'com.android.application' version '8.7.0' apply false
4+
id 'com.android.library' version '8.7.0' apply false
55
}
66

7-
task clean(type: Delete) {
8-
delete rootProject.buildDir
7+
tasks.register('clean', Delete) {
8+
delete rootProject.layout.buildDirectory
99
}

examples/cast_android/gradle.properties

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,16 @@
33
# Gradle settings configured through the IDE *will override*
44
# any settings specified in this file.
55
# For more details on how to configure your build environment visit
6-
# http://www.gradle.org/docs/current/userguide/build_environment.html
6+
# https://www.gradle.org/docs/current/userguide/build_environment.html
77
# Specifies the JVM arguments used for the daemon process.
88
# The setting is particularly useful for tweaking memory settings.
99
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
1010
# When configured, Gradle will run in incubating parallel mode.
1111
# This option should only be used with decoupled projects. More details, visit
12-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
12+
# https://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1313
# org.gradle.parallel=true
1414
# AndroidX package structure to make it clearer which packages are bundled with the
1515
# Android operating system, and which are packaged with your app"s APK
1616
# https://developer.android.com/topic/libraries/support-library/androidx-rn
1717
android.useAndroidX=true
18-
# Enables namespacing of each library's R class so that its R class includes only the
19-
# resources declared in the library itself and none from the library's dependencies,
20-
# thereby reducing the size of the R class for that library
21-
android.nonTransitiveRClass=true
18+
org.gradle.warning.mode=all
-15.4 KB
Binary file not shown.
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Tue Sep 13 14:26:16 PDT 2022
21
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)