Commit 070c68f8 authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Update gradle and gitlab-ci

parent 91570730

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
# based on https://about.gitlab.com/blog/2018/10/24/setting-up-gitlab-ci-for-android-projects/

image: openjdk:16-jdk

image: android30



variables:

  ANDROID_COMPILE_SDK: "28"

.idea/compiler.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="CompilerConfiguration">

    <bytecodeTargetLevel target="15" />

    <bytecodeTargetLevel target="1.8" />

  </component>

</project>
 
 No newline at end of file

.idea/gradle.xml

+1 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="GradleMigrationSettings" migrationVersion="1" />

  <component name="GradleSettings">

    <option name="linkedExternalProjectsSettings">

      <GradleProjectSettings>

.idea/misc.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_15_PREVIEW" project-jdk-name="JDK" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/build/classes" />

  </component>

  <component name="ProjectType">

build.gradle

+2 −2
Original line number Diff line number Diff line 
// Top-level build file where you can add configuration options common to all sub-projects/modules.

plugins {

    id 'com.android.application' version '7.2.0' apply false

    id 'com.android.library' version '7.2.0' apply false

    id 'com.android.application' version '7.2.1' apply false

    id 'com.android.library' version '7.2.1' apply false

}



task clean(type: Delete) {