Merge branch 'develop'

.travis.yml

@@ -0,0 +1,61 @@
+language: android
+jdk: oraclejdk8
+env:
+  global:
+    # install timeout in minutes (2 minutes by default)
+    - ADB_INSTALL_TIMEOUT=16
+    # - ANDROID_ABI=armeabi-v7a
+    # - ANDROID_TAG=google_apis
+android:
+  components:
+    # Uncomment the lines below if you want to
+    # use the latest revision of Android SDK Tools
+    - platform-tools
+    - tools
+
+    # The BuildTools version used by your project
+    - build-tools-28.0.3
+    # - build-tools-26.0.1
+
+    # ANDROID_BUILD_TOOLS=28.0.3
+    # The SDK version used to compile your project
+    - android-28
+    - extra
+    # Additional components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+    #- addon-google_apis-google-19
+
+    # Specify at least one system image,
+    # if you need to run emulator(s) during your tests
+    #- sys-img-armeabi-v7a-android-22
+    # - sys-img-x86-android-26
+    # - sys-img-x86-google_apis_playstore-26
+    # - sys-img-armeabi-v7a-google_apis-25
+  before_install:
+    - yes | sdkmanager "platforms;android-28;default;armeabi-v7a"
+    - mkdir "$ANDROID_HOME/licenses" || true
+    - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55" > "$ANDROID_HOME/licenses/android-sdk-license"
+    - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
+  licenses:
+    - 'android-sdk-preview-license-.+'
+    - 'android-sdk-license-.+'
+    - 'google-gdk-license-.+'
+git:
+  depth: 3
+
+# Emulator Management: Create, Start and Wait
+# before_script:
+#  - android list targets
+#  - echo no | android create avd --force -n test -t android-25 --abi $ANDROID_ABI --tag $ANDROID_TAG
+#  - emulator -avd test -no-window &
+#  - android-wait-for-emulator
+#  - adb shell input keyevent 82 &
+
+script:
+  # - android list targets
+  # - ./gradlew clean build -PdisablePreDex connectedAndroidTest --stacktrace
+  # don't execute instrumented tests
+  - ./gradlew clean test assembleDebug -PdisablePreDex --stacktrace
+

app/build.gradle

@@ -1,5 +1,9 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+apply plugin: 'maven'
+//apply plugin: 'com.google.android.gms.oss-licenses-plugin'
+
+//sourceCompatibility = '1.7'
+//targetCompatibility = '1.7'
 
 android {
     compileSdkVersion 28
@@ -38,7 +42,6 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.12.0'
 //    androidTestImplementation 'org.mockito:mockito-android:2.12.0'
     implementation files('libs/android-core.jar')
-    implementation files('libs/controlP5.jar')
     implementation files('libs/Ketai.jar')
     implementation files('libs/oscP5.jar')
     implementation 'jp.co.cyberagent.android.gpuimage:gpuimage-library:1.4.1'
@@ -50,3 +53,22 @@ dependencies {
     androidTestImplementation 'com.linkedin.dexmaker:dexmaker-mockito:2.12.1'
     androidTestImplementation 'com.android.support.test:rules:1.0.2'
 }
+
+task createPom << {
+    pom {
+        project {
+            groupId 'net.videosc2'
+            artifactId 'test'
+            version '1.0.0'
+
+            inceptionYear '2018'
+            licenses {
+                license {
+                    name 'The Apache Software License, Version 2.0'
+                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    distribution 'repo'
+                }
+            }
+        }
+    }.writeTo("pom.xml")
+}

app/src/main/java/net/videosc2/fragments/VideOSCSettingsFragment.java

@@ -546,7 +546,7 @@ public void onFocusChange(View v, boolean hasFocus) {
 									);
 									values.clear();
 									settings.get(0).setCalculationPeriod(Short.parseShort(calcPeriod, 10));
-									// FIXME: framerate doesn't always seem get set correctly
+									// FIXME: framerate doesn't always seem to get set correctly
 								}
 							}
 						});

app/src/test/java/net/videosc2/views/SliderBarTest.java

@@ -1,6 +1,6 @@
 package net.videosc2.views;
 
-import android.content.Context;
+import android.app.Activity;
 import android.graphics.Rect;
 
 import org.junit.Before;
@@ -16,7 +16,7 @@ public class SliderBarTest {
 	private SliderBar bar;
 
 	@Mock
-	private Context mMockContext;
+	private Activity mMockContext;
 
 	@Before
 	public void setUp() {

build.gradle

@@ -6,14 +6,18 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
-        classpath 'com.google.android.gms:oss-licenses-plugin:0.9.4'
+        classpath 'com.android.tools.build:gradle:3.3.1'
+//        classpath 'com.google.android.gms:oss-licenses-plugin:0.9.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+//plugins {
+//    id 'maven'
+//}
+
 allprojects {
     repositories {
         jcenter()

gradle.properties

@@ -12,3 +12,4 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 #android.debug.obsoleteApi=true
+#org.gradle.logging.level=info