Skip to content

Commit 8f4f49b

Browse files
committed
Changes introduced by Claudine AI agent
1 parent a6b5c92 commit 8f4f49b

File tree

16 files changed

+309
-22
lines changed

16 files changed

+309
-22
lines changed

apps/armarkers/build.gradle

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ plugins {
33
}
44

55
android {
6+
compileSdkVersion 33
67
defaultConfig {
78
applicationId "processing.tests.armarkers"
89
minSdkVersion 23
@@ -19,8 +20,8 @@ android {
1920
productFlavors {
2021
}
2122
compileOptions {
22-
sourceCompatibility JavaVersion.VERSION_1_8
23-
targetCompatibility JavaVersion.VERSION_1_8
23+
sourceCompatibility JavaVersion.VERSION_17
24+
targetCompatibility JavaVersion.VERSION_17
2425
}
2526
namespace 'armarkers'
2627
}
@@ -32,4 +33,4 @@ dependencies {
3233
implementation project(':libs:processing-ar')
3334
implementation 'androidx.appcompat:appcompat:1.6.0'
3435
implementation 'com.google.ar:core:1.35.0'
35-
}
36+
}

apps/armarkers/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
android:versionCode="1"
55
android:versionName="1.0">
66
<uses-permission android:name="android.permission.CAMERA"/>
7+
<uses-feature android:name="android.hardware.camera" android:required="false" />
78
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
89
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
910
<application android:icon="@mipmap/ic_launcher"

apps/arscene/src/main/AndroidManifest.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
android:versionCode="1"
55
android:versionName="1.0">
66
<uses-permission android:name="android.permission.CAMERA"/>
7+
<uses-feature android:name="android.hardware.camera" android:required="false" />
78
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
89
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
910
<application android:icon="@mipmap/ic_launcher"

apps/simple/build.gradle

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ plugins {
33
}
44

55
android {
6+
namespace 'processing.tests.simple'
7+
compileSdkVersion 33
8+
69
defaultConfig {
710
applicationId "processing.tests.simple"
811
minSdkVersion 17
@@ -14,19 +17,19 @@ android {
1417
buildTypes {
1518
release {
1619
minifyEnabled false
17-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20+
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
1821
}
1922
}
2023

2124
compileOptions {
2225
sourceCompatibility JavaVersion.VERSION_1_8
2326
targetCompatibility JavaVersion.VERSION_1_8
24-
}
27+
}
2528
}
2629

2730
dependencies {
28-
testImplementation 'junit:junit:4.13.2'
29-
implementation 'androidx.appcompat:appcompat:1.6.0'
31+
testImplementation 'junit:junit:4.13.2'
32+
implementation 'androidx.appcompat:appcompat:1.6.1'
3033

3134
implementation project(':libs:processing-core')
3235
}

apps/simple/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:theme="@style/AppTheme"
99
android:hardwareAccelerated="true"
1010
android:largeHeap="true">
11-
<activity android:name=".MainActivity"
11+
<activity android:name="simple.MainActivity"
1212
android:exported="true">
1313
<intent-filter>
1414
<action android:name="android.intent.action.MAIN"/>

apps/vrcube/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
android:label="@string/app_name"
1313
android:theme="@style/VrActivityTheme">
1414
<activity android:configChanges="orientation|keyboardHidden|screenSize"
15-
android:name=".MainActivity"
15+
android:name="vrcube.MainActivity"
1616
android:resizeableActivity="false"
1717
android:screenOrientation="landscape"
1818
android:exported="true">

apps/wallpaper/src/main/res/values-w820dp/dimens.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
33
(such as screen margins) for screens with more than 820dp of available width. This
44
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
5-
<dimen name="activity_horizontal_margin">64dp</dimen>
6-
</resources>
5+
<!-- <dimen name="activity_horizontal_margin">64dp</dimen>-->
6+
</resources>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<resources>
2+
<dimen name="activity_horizontal_margin">16dp</dimen>
3+
</resources>

build.gradle

+22-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.3.1'
9+
classpath 'com.android.tools.build:gradle:8.0.2'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
@@ -28,8 +28,28 @@ allprojects {
2828
mavenCentral()
2929
google()
3030
}
31+
32+
// Set Java compatibility for all projects
33+
plugins.withType(JavaPlugin).configureEach {
34+
java {
35+
toolchain {
36+
languageVersion = JavaLanguageVersion.of(17)
37+
}
38+
}
39+
}
40+
41+
// Set Android compatibility for all Android projects
42+
plugins.withType(com.android.build.gradle.BasePlugin).configureEach {
43+
android {
44+
compileSdkVersion 33
45+
compileOptions {
46+
sourceCompatibility JavaVersion.VERSION_17
47+
targetCompatibility JavaVersion.VERSION_17
48+
}
49+
}
50+
}
3151
}
3252

33-
task clean(type: Delete) {
53+
tasks.register('clean', Delete) {
3454
delete rootProject.buildDir
3555
}

gradle.properties

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
android.enableJetifier=true
2-
android.useAndroidX=true
1+
org.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64
2+
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
3+
android.useAndroidX=true
4+
android.enableJetifier=true
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)