Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Gradle 8.0 (Auto-generated) #773

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions apps/armarkers/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ plugins {
}

android {
compileSdkVersion 33
defaultConfig {
applicationId "processing.tests.armarkers"
minSdkVersion 23
Expand All @@ -19,8 +20,8 @@ android {
productFlavors {
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
namespace 'armarkers'
}
Expand All @@ -32,4 +33,4 @@ dependencies {
implementation project(':libs:processing-ar')
implementation 'androidx.appcompat:appcompat:1.6.0'
implementation 'com.google.ar:core:1.35.0'
}
}
1 change: 1 addition & 0 deletions apps/armarkers/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.CAMERA"/>
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<application android:icon="@mipmap/ic_launcher"
Expand Down
1 change: 1 addition & 0 deletions apps/arscene/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
android:versionCode="1"
android:versionName="1.0">
<uses-permission android:name="android.permission.CAMERA"/>
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.camera.ar" android:required="true"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<application android:icon="@mipmap/ic_launcher"
Expand Down
11 changes: 7 additions & 4 deletions apps/simple/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ plugins {
}

android {
namespace 'processing.tests.simple'
compileSdkVersion 33

defaultConfig {
applicationId "processing.tests.simple"
minSdkVersion 17
Expand All @@ -14,19 +17,19 @@ android {
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

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

dependencies {
testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.6.0'
testImplementation 'junit:junit:4.13.2'
implementation 'androidx.appcompat:appcompat:1.6.1'

implementation project(':libs:processing-core')
}
2 changes: 1 addition & 1 deletion apps/simple/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:theme="@style/AppTheme"
android:hardwareAccelerated="true"
android:largeHeap="true">
<activity android:name=".MainActivity"
<activity android:name="simple.MainActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
Expand Down
2 changes: 1 addition & 1 deletion apps/vrcube/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:label="@string/app_name"
android:theme="@style/VrActivityTheme">
<activity android:configChanges="orientation|keyboardHidden|screenSize"
android:name=".MainActivity"
android:name="vrcube.MainActivity"
android:resizeableActivity="false"
android:screenOrientation="landscape"
android:exported="true">
Expand Down
4 changes: 2 additions & 2 deletions apps/wallpaper/src/main/res/values-w820dp/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<!-- Example customization of dimensions originally defined in res/values/dimens.xml
(such as screen margins) for screens with more than 820dp of available width. This
would include 7" and 10" devices in landscape (~960dp and ~1280dp respectively). -->
<dimen name="activity_horizontal_margin">64dp</dimen>
</resources>
<!-- <dimen name="activity_horizontal_margin">64dp</dimen>-->
</resources>
3 changes: 3 additions & 0 deletions apps/wallpaper/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<resources>
<dimen name="activity_horizontal_margin">16dp</dimen>
</resources>
24 changes: 22 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.3.1'
classpath 'com.android.tools.build:gradle:8.0.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -28,8 +28,28 @@ allprojects {
mavenCentral()
google()
}

// Set Java compatibility for all projects
plugins.withType(JavaPlugin).configureEach {
java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}
}

// Set Android compatibility for all Android projects
plugins.withType(com.android.build.gradle.BasePlugin).configureEach {
android {
compileSdkVersion 33
compileOptions {
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}
}
}

task clean(type: Delete) {
tasks.register('clean', Delete) {
delete rootProject.buildDir
}
6 changes: 4 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
android.enableJetifier=true
android.useAndroidX=true
org.gradle.java.home=/usr/lib/jvm/java-1.17.0-openjdk-amd64
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true
android.enableJetifier=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading