diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml index c197819d..ee18be92 100644 --- a/.github/workflows/Android-CI.yml +++ b/.github/workflows/Android-CI.yml @@ -101,7 +101,7 @@ jobs: distribution: 'adopt' java-version: ${{ matrix.java_version }} - name: build release - run: ./gradlew assembleRelease + run: ./gradlew assemble env: VERSION: ${{ github.ref }} - name: investigate aar diff --git a/IOIOLibAndroid/build.gradle b/IOIOLibAndroid/build.gradle index 79007c98..eea55cbe 100644 --- a/IOIOLibAndroid/build.gradle +++ b/IOIOLibAndroid/build.gradle @@ -25,4 +25,4 @@ publishing { } } } -} \ No newline at end of file +} diff --git a/IOIOLibCore/.classpath b/IOIOLibCore/.classpath deleted file mode 100644 index 50660d74..00000000 --- a/IOIOLibCore/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/IOIOLibCore/.project b/IOIOLibCore/.project deleted file mode 100644 index 53dcfcb7..00000000 --- a/IOIOLibCore/.project +++ /dev/null @@ -1,18 +0,0 @@ - - - IOIOLibCore - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.springsource.ide.eclipse.gradle.core.nature - org.eclipse.jdt.core.javanature - - diff --git a/IOIOLibPC/.classpath b/IOIOLibPC/.classpath deleted file mode 100644 index 50660d74..00000000 --- a/IOIOLibPC/.classpath +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/IOIOLibPC/.project b/IOIOLibPC/.project deleted file mode 100644 index c6f7c6f4..00000000 --- a/IOIOLibPC/.project +++ /dev/null @@ -1,24 +0,0 @@ - - - IOIOLibPC - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.springsource.ide.eclipse.gradle.core.nature - org.eclipse.jdt.core.javanature - - - - IOIOLIB - $%7BPARENT-2-PROJECT_LOC%7D - - - diff --git a/IOIOLibPC/build.gradle b/IOIOLibPC/build.gradle index d44ceffb..d97fed47 100644 --- a/IOIOLibPC/build.gradle +++ b/IOIOLibPC/build.gradle @@ -1,16 +1,18 @@ -apply plugin: 'java-library' +plugins { + id 'java-library' +} javadoc { source = fileTree(dir: 'src/main/java') failOnError = false } -task javadocJar(type: Jar) { +tasks.register('javadocJar', Jar) { archiveClassifier = 'javadoc' from javadoc } -task sourcesJar(type: Jar) { +tasks.register('sourcesJar', Jar) { archiveClassifier = 'sources' from sourceSets.main.allSource } @@ -23,3 +25,8 @@ dependencies { implementation 'com.sparetimelabs:purejavacomm:1.0.1' api project(":IOIOLibCore") } + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +}