Skip to content

Commit e56e9da

Browse files
JimSekerJimSeker
committed
updated to gradle, API, and minor fixes.
1 parent 4e7890f commit e56e9da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+137
-167
lines changed

‎OpenGL30Cube/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenGL30Cube/.idea/gradle.xml

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

‎OpenGL30Cube/.idea/jarRepositories.xml

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

‎OpenGL30Cube/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenGL30Cube/.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎OpenGL30Cube/app/build.gradle

Lines changed: 3 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 30
4+
compileSdkVersion 32
55

66
defaultConfig {
77
applicationId "edu.cs4730.opengl30cube"
8-
minSdkVersion 24
9-
targetSdkVersion 30
8+
minSdkVersion 26
9+
targetSdkVersion 32
1010
versionCode 1
1111
versionName "1.0"
1212
}

‎OpenGL30Cube/app/src/main/AndroidManifest.xml

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

59
<application
610
android:allowBackup="true"
711
android:icon="@mipmap/ic_launcher"
812
android:label="@string/app_name">
913
<activity
1014
android:name=".MainActivity"
11-
android:label="@string/app_name" >
15+
android:exported="true">
1216
<intent-filter>
1317
<action android:name="android.intent.action.MAIN" />
1418

‎OpenGL30Cube/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
5+
mavenCentral()
66
google()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:7.1.2'
1010

1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
1515

1616
allprojects {
1717
repositories {
18-
jcenter()
18+
mavenCentral()
1919
google()
2020
}
2121
}

‎OpenGL30Cube/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

‎OpenGL30CubeTextureView/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenGL30CubeTextureView/.idea/gradle.xml

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

‎OpenGL30CubeTextureView/.idea/jarRepositories.xml

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

‎OpenGL30CubeTextureView/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenGL30CubeTextureView/.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎OpenGL30CubeTextureView/app/build.gradle

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

33
android {
4-
compileSdkVersion 30
4+
compileSdkVersion 32
55

66
defaultConfig {
77
applicationId "edu.cs4730.opengl30cubetextureview"
8-
minSdkVersion 24
9-
targetSdkVersion 30
8+
minSdkVersion 26
9+
targetSdkVersion 32
1010
versionCode 1
1111
versionName "1.0"
1212
}
@@ -20,5 +20,5 @@ android {
2020

2121
dependencies {
2222
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation 'androidx.appcompat:appcompat:1.2.0'
23+
implementation 'androidx.appcompat:appcompat:1.4.1'
2424
}

‎OpenGL30CubeTextureView/app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="edu.cs4730.opengl30cubetextureview">
4+
<!-- Tell the system this application requires OpenGL ES 3.0. -->
5+
<uses-feature
6+
android:glEsVersion="0x00030000"
7+
android:required="true" />
48

59
<application
610
android:allowBackup="true"
711
android:icon="@mipmap/ic_launcher"
812
android:label="@string/app_name"
913
android:supportsRtl="true"
1014
android:theme="@style/AppTheme">
11-
<activity android:name=".MainActivity">
15+
<activity
16+
android:name=".MainActivity"
17+
android:exported="true">
1218
<intent-filter>
1319
<action android:name="android.intent.action.MAIN" />
1420

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public void onPause() {
5757
public void onResume() {
5858
super.onResume(); // Always call the superclass method first
5959

60-
if (mGLTextureView.isRunning == false) {
60+
if (!mGLTextureView.isRunning) {
6161
//everything is closed down and we have problem. Restart
6262
mGLTextureView = new myGLTextureView(this);
6363
mGLTextureView.setRenderer(new myRenderer(this));

‎OpenGL30CubeTextureView/build.gradle

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@
22

33
buildscript {
44
repositories {
5-
jcenter()
6-
maven {
7-
url 'https://maven.google.com/'
8-
name 'Google'
9-
}
5+
mavenCentral()
106
google()
117
}
128
dependencies {
13-
classpath 'com.android.tools.build:gradle:4.1.2'
9+
classpath 'com.android.tools.build:gradle:7.1.2'
1410

1511
// NOTE: Do not place your application dependencies here; they belong
1612
// in the individual module build.gradle files
@@ -19,11 +15,8 @@ buildscript {
1915

2016
allprojects {
2117
repositories {
22-
jcenter()
23-
maven {
24-
url 'https://maven.google.com/'
25-
name 'Google'
26-
}
18+
mavenCentral()
19+
google()
2720
}
2821
}
2922

‎OpenGL30CubeTextureView/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip

‎OpenGL30Pyramid/.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenGL30Pyramid/.idea/gradle.xml

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

‎OpenGL30Pyramid/.idea/jarRepositories.xml

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

‎OpenGL30Pyramid/.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OpenGL30Pyramid/.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎OpenGL30Pyramid/app/build.gradle

Lines changed: 3 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 30
4+
compileSdkVersion 32
55

66
defaultConfig {
77
applicationId "edu.cs4730.opengl30pyramid"
8-
minSdkVersion 24
9-
targetSdkVersion 30
8+
minSdkVersion 26
9+
targetSdkVersion 32
1010
versionCode 1
1111
versionName "1.0"
1212
}

‎OpenGL30Pyramid/app/src/main/AndroidManifest.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="edu.cs4730.opengl30pyramid">
4+
<!-- Tell the system this application requires OpenGL ES 3.0. -->
5+
<uses-feature
6+
android:glEsVersion="0x00030000"
7+
android:required="true" />
48

59
<application
610
android:allowBackup="true"
@@ -9,7 +13,9 @@
913
android:supportsRtl="true">
1014

1115

12-
<activity android:name=".MainActivity">
16+
<activity
17+
android:name=".MainActivity"
18+
android:exported="true">
1319
<intent-filter>
1420
<action android:name="android.intent.action.MAIN" />
1521

0 commit comments

Comments
 (0)