Skip to content

Commit 912f445

Browse files
committed
updated to api 35
these work.
1 parent b083209 commit 912f445

File tree

10 files changed

+29
-11
lines changed

10 files changed

+29
-11
lines changed

OpenGL30Cube/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 33
4+
compileSdkVersion 35
55

66
defaultConfig {
77
applicationId "edu.cs4730.opengl30cube"
8-
minSdkVersion 26
9-
targetSdkVersion 33
8+
minSdkVersion 29
9+
targetSdkVersion 35
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -16,6 +16,7 @@ android {
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}
19+
namespace 'edu.cs4730.opengl30cube'
1920
}
2021

2122
dependencies {

OpenGL30Cube/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="edu.cs4730.opengl30cube">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43
<!-- Tell the system this application requires OpenGL ES 3.0. -->
54
<uses-feature
65
android:glEsVersion="0x00030000"

OpenGL30Cube/app/src/main/java/edu/cs4730/opengl30cube/MainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
*
1414
* The code here, simply makes sure that opengl 3.0 is available and starts up
1515
* the the surfaceview class I extended.
16+
*
17+
* this works on android 15 devices (pixel 7 and 8).
1618
*/
1719

1820
public class MainActivity extends Activity {

OpenGL30Cube/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.4.0'
9+
classpath 'com.android.tools.build:gradle:8.7.2'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files

OpenGL30Cube/gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,6 @@
1515
# When configured, Gradle will run in incubating parallel mode.
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
18-
# org.gradle.parallel=true
18+
# org.gradle.parallel=true
19+
android.nonFinalResIds=false
20+
android.nonTransitiveRClass=true

OpenGL30CubeTextureView/app/src/main/java/edu/cs4730/opengl30cubetextureview/MainActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
*
1313
* The code here, simply makes sure that opengl 3.0 is available and starts up
1414
* the TextureView class I extended.
15+
*
16+
* This is working on android 15 devices.
1517
*/
1618

1719
public class MainActivity extends AppCompatActivity {

OpenGL30CubeTextureView/gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
android.defaults.buildfeatures.buildconfig=true
2019
android.enableJetifier=true
2120
android.nonFinalResIds=false
22-
android.nonTransitiveRClass=false
21+
android.nonTransitiveRClass=true
2322
android.useAndroidX=true

OpenGL30Pyramid/.idea/deploymentTargetSelector.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

OpenGL30Pyramid/app/src/main/java/edu/cs4730/opengl30pyramid/MainActivity.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@
88
import android.util.Log;
99
import android.view.View;
1010

11+
/**
12+
* this is simple test to show that pyramid in 3D space can be drawn, like the cube.
13+
*
14+
* note this is working on android 15 devices.
15+
*/
16+
1117
public class MainActivity extends Activity {
1218

1319
@Override

OpenGL30Pyramid/gradle.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
# This option should only be used with decoupled projects. More details, visit
1717
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1818
# org.gradle.parallel=true
19-
android.defaults.buildfeatures.buildconfig=true
2019
android.nonFinalResIds=false
21-
android.nonTransitiveRClass=false
20+
android.nonTransitiveRClass=true

0 commit comments

Comments
 (0)