Skip to content

Commit

Permalink
rebuild
Browse files Browse the repository at this point in the history
  • Loading branch information
JobGetabu committed Feb 12, 2019
1 parent f792170 commit be3f3d5
Show file tree
Hide file tree
Showing 13 changed files with 88 additions and 45 deletions.
58 changes: 35 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
language: android
jdk: oraclejdk8
language : android
sudo : required
jdk : oraclejdk8
env:
global:
- ANDROID_TARGET=android-27
- ANDROID_ABI=armeabi-v7a
android:
components:
- tools
- platform-tools
- build-tools-28.0.3
- android-28
- extra-android-m2repository
- $ANDROID_TARGET
- sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
script:
- ./gradlew build jacocoTestReport assembleAndroidTest
- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
- emulator -avd test -no-skin -no-audio -no-window &
- android-wait-for-emulator
- adb shell setprop dalvik.vm.dexopt-flags v=n,o=v
- ./gradlew connectedCheck
after_success:
- bash <(curl -s https://codecov.io/bash)
global :
- ANROID_API_LEVEL = 28
- ANDROID_BUILD_TOOLS_VERSION = 28.0.3
android :
components :
- tools
- platform-tools
- build-tools-$ANDROID_BUILD_TOOLS_VERSION
- android - $ANDROID_API_LEVEL
- extra-google-google_play_services
- extra-google-m2repository
- addon-google_apis-google-$ANDROID_API_LEVEL
licences :
- 'android-sdk-preview-license-.+'
- 'android-sdk-license-.+'
- 'google-gdk-license-.+'
before_script :
- mkdir -p "$ANDROID_HOME/licenses"
- cp ./licenses/* "$ANDROID_HOME/licenses"
before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/
cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
- $HOME/.android/build-cache
script :
- ./gradlew build check
before_install:
- chmod +x gradlew
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android {
compileSdkVersion 28
buildToolsVersion "28.0.3"
defaultConfig {
applicationId "com.droidnet"
applicationId "com.droidapp"
minSdkVersion 16
targetSdkVersion 28
versionCode 1
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.droidnet">
package="com.droidapp">

<application
android:name=".MyApp"
android:name="com.droidapp.MyApp"
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".MainActivity">
<activity android:name="com.droidapp.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".Main2Activity" />
<activity android:name="com.droidapp.Main2Activity" />
</application>

</manifest>
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package com.droidnet;
package com.droidapp;

import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.widget.TextView;

import com.droidnet.InternetAvailabilityChecker;
import com.droidnet.InternetConnectivityListener;


public class Main2Activity extends AppCompatActivity implements InternetConnectivityListener {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.droidnet;
package com.droidapp;

import android.content.Intent;
import android.os.Bundle;
Expand All @@ -7,6 +7,9 @@
import android.view.View;
import android.widget.TextView;

import com.droidnet.InternetAvailabilityChecker;
import com.droidnet.InternetConnectivityListener;


public class MainActivity extends AppCompatActivity implements InternetConnectivityListener {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package com.droidnet;
package com.droidapp;

import android.app.Application;

import com.droidnet.InternetAvailabilityChecker;

/**
* Created by aa on 29/04/17.
*/
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.droidnet.MainActivity">
tools:context="com.droidapp.MainActivity">

<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/activity_main2.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.droidnet.Main2Activity">
tools:context="com.droidapp.Main2Activity">

<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
Expand Down
43 changes: 31 additions & 12 deletions droidnet/build.gradle
Original file line number Diff line number Diff line change
@@ -1,34 +1,53 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 28
ext {
bintrayRepo = 'maven'
bintrayName = 'droidnet'

publishedGroupId = 'com.job'
libraryName = 'DroidNet'
artifact = 'droidnet'

libraryDescription = 'DroidNet is an Android library listening to network connection state and Internet connectivity with the assumption that active internet connection or not. Connecting to a network doesn’t necessarily mean that device has active internet connection'

siteUrl = 'https://github.com/JobGetabu/DroidNet'
gitUrl = 'https://github.com/JobGetabu/DroidNet.git'

libraryVersion = '1.0.0'

developerId = 'JobGetabu'
developerName = 'Job Getabu'
developerEmail = '[email protected]'

licenseName = 'The Apache Software License, Version 2.0'
licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
allLicenses = ["Apache-2.0"]
}

android {
compileSdkVersion 28
buildToolsVersion "28.0.3"

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
versionCode 1
versionName "1.0"
versionCode 3
versionName "1.0.0"

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

}

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])

implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
}

apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/installv1.gradle'
apply from: 'https://raw.githubusercontent.com/nuuneoi/JCenter/master/bintrayv1.gradle'
3 changes: 3 additions & 0 deletions licenses/android-sdk-license
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

8933bad161af4178b1185d1a37fbf41ea5269c55
d56f5187479451eabf01fb78af6dfcb131a6481e
2 changes: 2 additions & 0 deletions licenses/intel-android-extra-license
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@

d975f751698a77b662f1254ddbeed3901e976f5a

0 comments on commit be3f3d5

Please sign in to comment.