Update gradle files to work with AndroidStudio

Author: rsahlin

build.gradle

@@ -4,8 +4,8 @@ allprojects  {
 
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
-        sourceCompatibility = JavaVersion.VERSION_1_7
-        targetCompatibility = JavaVersion.VERSION_1_7
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
 }

graphics-by-opengl-android/AndroidManifest.xml

@@ -1,10 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.super2k.nucleus.android" >
-
-    <uses-sdk
-        android:minSdkVersion="21"
-        android:targetSdkVersion="25" />
-
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />

graphics-by-opengl-android/build.gradle

@@ -1,49 +1,40 @@
-group = 'com.super2k.graphics-by-opengl'
-version = '0.0.1-SNAPSHOT'
-
-tasks.withType(JavaCompile) {
-    options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
-}
-
 buildscript {
     repositories {
         jcenter()
         mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'digital.wup:android-maven-publish:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.5.3'
     }
 }
 
+apply plugin: 'com.android.library'
+
 repositories {
     mavenCentral()
     jcenter()
     google()
 }
 
-apply plugin: 'com.android.library'
-
 android {
-    compileSdkVersion 25
+    compileSdkVersion 29
     lintOptions {
         disable 'MissingTranslation'
     }
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
+            java.srcDirs = ['src/main/java']
             resources.srcDirs = ['res']
             res.srcDirs = ['res']
             assets.srcDirs = ['res']
         }
-	}
+    }
 
     defaultConfig {
-        minSdkVersion 21
+        minSdkVersion 24
+        targetSdkVersion 29
         versionCode 1
         versionName "1"
         multiDexEnabled true
@@ -57,35 +48,9 @@ android {
 }
 
 dependencies {
+    implementation project (':graphics-by-opengl-j2se')
 	implementation 'com.google.android.gms:play-services:10.0.1'
     implementation 'com.android.support:multidex:1.0.2'
-    implementation 'com.super2k.graphics-by-opengl:graphics-by-opengl-j2se:0.0.1-SNAPSHOT'
     testImplementation 'junit:junit:4.12'
     testImplementation "org.mockito:mockito-core:2.+"
-}
-
-//apply plugin: 'digital.wup.android-maven-publish'
-apply plugin: 'maven-publish'
-
-task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.srcDirs
-}
-
-publishing {
-    publications {
-        maven(MavenPublication) {
-            groupId 'com.super2k.graphics-by-opengl'
-            artifactId 'graphics-by-opengl-android'
-            version '0.0.1-SNAPSHOT'
-            artifact bundleRelease
-            artifact(androidSourcesJar)
-        }
-    }
-}
-
-
-//apply plugin: 'com.google.gms.google-services'
-
-
-
+}

graphics-by-opengl-j2se/build.gradle

@@ -3,8 +3,8 @@ version = '0.0.1-SNAPSHOT'
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
-    sourceCompatibility = JavaVersion.VERSION_1_7
-    targetCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 apply plugin: 'java'
@@ -14,21 +14,7 @@ repositories {
     jcenter()
 }
 dependencies {
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'com.super2k.vecmath:vecmath:0.0.1-SNAPSHOT'
-    testCompile 'junit:junit:4.12'
-}
-
-apply plugin: 'maven-publish'
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact(sourcesAndClasses)
-        }
-    }
-}
-task sourcesAndClasses(type: Jar) {
-    from sourceSets.main.output
-    from sourceSets.main.allJava
+    implementation project(':vecmath')
+    implementation 'com.google.code.gson:gson:2.8.1'
+    testImplementation 'junit:junit:4.12'
 }

settings.gradle

@@ -1,8 +1,8 @@
 rootProject.name = 'graphics-by-opengl'
-include ':graphics-by-opengl-j2se'
-include ':graphics-by-opengl-jogl'
 include ':graphics-by-opengl-android'
+include ':graphics-by-opengl-j2se'
+include ':vecmath'
 
-project(':graphics-by-opengl-j2se').projectDir = "$rootDir/graphics-by-opengl-j2se" as File
-project(':graphics-by-opengl-android').projectDir = "$rootDir/graphics-by-opengl-android" as File
-project(':graphics-by-opengl-jogl').projectDir = "$rootDir/graphics-by-opengl-jogl" as File
+project(':graphics-by-opengl-android').projectDir = new File('graphics-by-opengl-android')
+project(':graphics-by-opengl-j2se').projectDir = new File('graphics-by-opengl-j2se')
+project(':vecmath').projectDir = new File('../vecmath')