Skip to content

Commit 7054394

Browse files
WonderCsaboWonderCsabo
committed
Update examples for AndroidAnnotations 3.3.2
1 parent 08e5646 commit 7054394

10 files changed

Lines changed: 13 additions & 12 deletions

File tree

‎examples/HelloWorldEclipse/.factorypath‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<factorypath>
22
<factorypathentry kind="PLUGIN" id="org.eclipse.jst.ws.annotations.core" enabled="true" runInBatchMode="false"/>
3-
<factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/compile-libs/androidannotations-3.3.1.jar" enabled="true" runInBatchMode="false"/>
4-
<factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/libs/androidannotations-api-3.3.1.jar" enabled="true" runInBatchMode="false"/>
3+
<factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/compile-libs/androidannotations-3.3.2.jar" enabled="true" runInBatchMode="false"/>
4+
<factorypathentry kind="WKSPJAR" id="/HelloWorldEclipse/libs/androidannotations-api-3.3.2.jar" enabled="true" runInBatchMode="false"/>
55
</factorypath>

‎examples/HelloWorldEclipse/compile-libs/androidannotations-3.3.1.jar‎

-738 KB
Binary file not shown.

‎examples/HelloWorldEclipse/compile-libs/androidannotations-3.3.2.jar‎

742 KB
Binary file not shown.

‎examples/HelloWorldEclipse/libs/androidannotations-api-3.3.1.jar‎

-119 KB
Binary file not shown.

‎examples/HelloWorldEclipse/libs/androidannotations-api-3.3.2.jar‎

120 KB
Binary file not shown.

‎examples/RoboGuiceExample/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55
dependencies {
66
// replace with the current version of the Android plugin
7-
classpath 'com.android.tools.build:gradle:1.2.2'
7+
classpath 'com.android.tools.build:gradle:1.2.3'
88
// the latest version of the android-apt plugin
99
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
1010
}
@@ -16,8 +16,8 @@ repositories {
1616
}
1717

1818
apply plugin: 'com.android.application'
19-
apply plugin: 'android-apt'
20-
def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.1
19+
apply plugin: 'com.neenbedankt.android-apt'
20+
def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.2
2121

2222
dependencies {
2323
apt "org.androidannotations:androidannotations:$AAVersion"

‎examples/RoboGuiceExample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip

‎examples/gradle/build.gradle‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55
dependencies {
66
// replace with the current version of the Android plugin
7-
classpath 'com.android.tools.build:gradle:1.2.2'
7+
classpath 'com.android.tools.build:gradle:1.2.3'
88
// the latest version of the android-apt plugin
99
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.4'
1010
}
@@ -16,8 +16,8 @@ repositories {
1616
}
1717

1818
apply plugin: 'com.android.application'
19-
apply plugin: 'android-apt'
20-
def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.1
19+
apply plugin: 'com.neenbedankt.android-apt'
20+
def AAVersion = '4.0-SNAPSHOT' // change this to your desired version, for example the latest stable: 3.3.2
2121

2222
dependencies {
2323
apt "org.androidannotations:androidannotations:$AAVersion"

‎examples/gradle/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip

‎examples/maveneclipse/pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<android.version>4.1.1.4</android.version>
1313
<android.platform>16</android.platform>
14-
<androidannotations.version>3.3.1</androidannotations.version>
14+
<androidannotations.version>3.3.2</androidannotations.version>
1515
<java.version>1.6</java.version>
1616
</properties>
1717

@@ -51,12 +51,13 @@
5151
<plugin>
5252
<groupId>com.simpligility.maven.plugins</groupId>
5353
<artifactId>android-maven-plugin</artifactId>
54-
<version>4.2.0</version>
54+
<version>4.3.0</version>
5555
<configuration>
5656
<sdk>
5757
<platform>${android.platform}</platform>
5858
</sdk>
5959
<undeployBeforeDeploy>true</undeployBeforeDeploy>
60+
<disableConflictingDependenciesWarning>true</disableConflictingDependenciesWarning>
6061
</configuration>
6162
<extensions>true</extensions>
6263
</plugin>

0 commit comments

Comments
 (0)