File tree 16 files changed +309
-22
lines changed
processing-ar/src/main/java/processing/ar
src/main/java/processing/android
16 files changed +309
-22
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ plugins {
3
3
}
4
4
5
5
android {
6
+ compileSdkVersion 33
6
7
defaultConfig {
7
8
applicationId " processing.tests.armarkers"
8
9
minSdkVersion 23
@@ -19,8 +20,8 @@ android {
19
20
productFlavors {
20
21
}
21
22
compileOptions {
22
- sourceCompatibility JavaVersion . VERSION_1_8
23
- targetCompatibility JavaVersion . VERSION_1_8
23
+ sourceCompatibility JavaVersion . VERSION_17
24
+ targetCompatibility JavaVersion . VERSION_17
24
25
}
25
26
namespace ' armarkers'
26
27
}
@@ -32,4 +33,4 @@ dependencies {
32
33
implementation project(' :libs:processing-ar' )
33
34
implementation ' androidx.appcompat:appcompat:1.6.0'
34
35
implementation ' com.google.ar:core:1.35.0'
35
- }
36
+ }
Original file line number Diff line number Diff line change 4
4
android : versionCode =" 1"
5
5
android : versionName =" 1.0" >
6
6
<uses-permission android : name =" android.permission.CAMERA" />
7
+ <uses-feature android : name =" android.hardware.camera" android : required =" false" />
7
8
<uses-feature android : name =" android.hardware.camera.ar" android : required =" true" />
8
9
<uses-feature android : glEsVersion =" 0x00020000" android : required =" true" />
9
10
<application android : icon =" @mipmap/ic_launcher"
Original file line number Diff line number Diff line change 4
4
android : versionCode =" 1"
5
5
android : versionName =" 1.0" >
6
6
<uses-permission android : name =" android.permission.CAMERA" />
7
+ <uses-feature android : name =" android.hardware.camera" android : required =" false" />
7
8
<uses-feature android : name =" android.hardware.camera.ar" android : required =" true" />
8
9
<uses-feature android : glEsVersion =" 0x00020000" android : required =" true" />
9
10
<application android : icon =" @mipmap/ic_launcher"
Original file line number Diff line number Diff line change @@ -3,6 +3,9 @@ plugins {
3
3
}
4
4
5
5
android {
6
+ namespace ' processing.tests.simple'
7
+ compileSdkVersion 33
8
+
6
9
defaultConfig {
7
10
applicationId " processing.tests.simple"
8
11
minSdkVersion 17
@@ -14,19 +17,19 @@ android {
14
17
buildTypes {
15
18
release {
16
19
minifyEnabled false
17
- proguardFiles getDefaultProguardFile(' proguard-android.txt' ), ' proguard-rules.pro'
20
+ proguardFiles getDefaultProguardFile(' proguard-android-optimize .txt' ), ' proguard-rules.pro'
18
21
}
19
22
}
20
23
21
24
compileOptions {
22
25
sourceCompatibility JavaVersion . VERSION_1_8
23
26
targetCompatibility JavaVersion . VERSION_1_8
24
- }
27
+ }
25
28
}
26
29
27
30
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 '
30
33
31
34
implementation project(' :libs:processing-core' )
32
35
}
Original file line number Diff line number Diff line change 8
8
android : theme =" @style/AppTheme"
9
9
android : hardwareAccelerated =" true"
10
10
android : largeHeap =" true" >
11
- <activity android : name =" .MainActivity"
11
+ <activity android : name =" simple .MainActivity"
12
12
android : exported =" true" >
13
13
<intent-filter >
14
14
<action android : name =" android.intent.action.MAIN" />
Original file line number Diff line number Diff line change 12
12
android : label =" @string/app_name"
13
13
android : theme =" @style/VrActivityTheme" >
14
14
<activity android : configChanges =" orientation|keyboardHidden|screenSize"
15
- android : name =" .MainActivity"
15
+ android : name =" vrcube .MainActivity"
16
16
android : resizeableActivity =" false"
17
17
android : screenOrientation =" landscape"
18
18
android : exported =" true" >
Original file line number Diff line number Diff line change 2
2
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
3
3
(such as screen margins) for screens with more than 820dp of available width. This
4
4
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 number Diff line number Diff line change
1
+ <resources >
2
+ <dimen name =" activity_horizontal_margin" >16dp</dimen >
3
+ </resources >
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ buildscript {
6
6
mavenCentral()
7
7
}
8
8
dependencies {
9
- classpath ' com.android.tools.build:gradle:7.3.1 '
9
+ classpath ' com.android.tools.build:gradle:8.0.2 '
10
10
11
11
// NOTE: Do not place your application dependencies here; they belong
12
12
// in the individual module build.gradle files
@@ -28,8 +28,28 @@ allprojects {
28
28
mavenCentral()
29
29
google()
30
30
}
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
+ }
31
51
}
32
52
33
- task clean ( type : Delete ) {
53
+ tasks . register( ' clean ' , Delete ) {
34
54
delete rootProject. buildDir
35
55
}
Original file line number Diff line number Diff line change 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
Original file line number Diff line number Diff line change 1
1
distributionBase =GRADLE_USER_HOME
2
2
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
4
4
zipStoreBase =GRADLE_USER_HOME
5
5
zipStorePath =wrapper/dists
You can’t perform that action at this time.
0 commit comments